More optimizations on the robot