Updated Movement FSM