Added joystick and motor calculations