updated map loader