step 6.0 - header enhacements (build)