HW class 4 small changes