1.5.2 Refactor