last changes before CTP2