last changes to model