changes for real robot, TODO: differentiate clearly