Last changes to work