change map to orderedMap