No longer using a dictionary.