Last changes before second deployment