Last changes and go on