Improved the headers