refactoring new header