NEO: Code Changes