updates for extra headers and token checks