Updated movement

Needs to be tested