Improved BaxterController