manual update of Nathan's Robo class changes