map is now fully functional