moving to HWRP + refactoring