MOD: Refactored