Movement

Removed unnecessary code.
Added distance restraint.