apply 10.4 changes to H.3