corrected token retrival for wave