Slight amendments fixed some behind the scenes bits for making smart
header more efficient