Movement code changes