logic issue
Reworked logic around token validation