             
             UserLocation.instance.requestLocation() { location in
                 
-                if let region = UserLocation.instance.currentRegion {
-                    self.mapView.setRegion(region, animated: false)
-                }
+                self.centerMapAround(location: location)
                 
                 self.useMyLocation = true
             }
         }
         
+    }
+    
+    func centerMapAround(location: CLLocationCoordinate2D) {
+        
+        let span = MKCoordinateSpan(latitudeDelta: 0.03, longitudeDelta: 0.03)
+        let region = MKCoordinateRegion(center: location, span: span)
+        self.mapView.setRegion(region, animated: false)
         
     }
     

        ZipCodes.locationForZipCode(zipCode: zipCode) { location in
            
            guard let location = location else { return }
            
            let span = MKCoordinateSpan(latitudeDelta: 0.03, longitudeDelta: 0.03)
            let region = MKCoordinateRegion(center: location, span: span)
            self.mapView?.setRegion(region, animated: false)
        }
    }
    

        
        if useMyLocation {
            
            let location = self.mapView.userLocation.coordinate
            centerMapAround(location: location)
            
        }
        else if useZipCode {
            
