updated map to be a simpler, cleaner operation