last changes to models