Changes from the robot test