change token generation to be more semantically correct
debug