Update with HW 3 - Other Types