swapped List for Map