NH3567 - Refactored