step 6.1 - header enhacements (build)