ALL REFACTORED