h3/h4 rework