token generation adjustments