Rearranged fieldset for better flow and re-purposed headerfields and literals