refactoring around hwacc