Need to change the token generation sequence