Refactored 1.5