added skala, refactoring