Update the headers for better flow.