Refactoring, fixed root