refactored merged headers