Complete header redo