Modify to work with headers.