fixed indexing, deleted regular expressions