step 6.2 - header enhacements (build)