Correct timing and token generation