last changes from nick