Replaced the MovementState logic with new movement logic
Small changes due to the new movement logic
Tried to fix git conflicts