Some serious work done on the header