last changes before merge