Refactored 12