Changed the header
merged and fixed problems with header