Now using Angle in MoveState