HEAVY REFACTORING