Final robotop changes