no more hardcoding, simpler adding to OrderedDict