added back custom header support