Edits to work with groovy and simulation pr2