Updated HW/PB for Th 9_05 and formatting