remove some puts
using the token
better initial query