removed "s" at end of the tokens
removed conversion problem