more reworks for HWBP