New format for map 2