switch dicts to the new regime