GREATER refactoring