adapted gripper controller
merge conflict