last changes before implementation!