- Added some treatment to the headers.