Changed the header to new format