added a flag to enable/disable tokenizing