removed OrderedDict dependency