Header compacted a little more