@brettweavnet ... @rickmendes ... This has been changed to use 'map' now.