removed preprocessing step from sets to lists, direct to dicts