Fixing up the header() function to work with new format, nissing *_name still due to missing collection