added tokenizing of strings