Some h4 repairs in here to support this blog