Added token expiration check back in