Smalle changes to work with robot