add working tokens
change helper name