Improve movement control