added header conditionals