move back to conditional based on headers