added string tokenization