Refactored to allow header updates
User core_account to set variables in header