last changes before merge with develop