Looping the buffer now

Also removing the condition on existing tokens