WP-4351-1 Switching tokens to be zero-based. Wee