last changes to TIY before merge