Last changes to version 1