more hwaf-ization