merged servo2 and worked on movement