start refactoring numering