updated to use mapkit
fixed conflicts