added map_coords
fixed conflicts