Last changes before starting over