Added more flexibility to the header 2