BaxterController improved