improved map, using dictionary to reference locations