really love it that the reference to the Map is removed.