Last changes before new robot