lots of updates, before changing header setup