last changes before class