Enhanced the header