updated to support non-cookie requests