updated to use new map object