Added code for manipulator