small change to use the Flat map.

TODO: make the actuall selected map be used