Last changes before submition