merged over best copies from SVn of code for robot years