last changes
last changes before refactoring