Refactored 1.1, 1.4, and 1.5