added dictionaries and tagging