Token validation working better.