modified token generation