Refactored 7_5