Proper header building on the way