start reworking token request validator