New lavel refactoring