Last changes before to start the long travel!