     }
     
     fileprivate func _saveImageToLibrary(atFileURL filePath: URL, _ imageCompletion: @escaping (UIImage?, NSError?) -> Void) {
-        guard let library = library else { imageCompletion(nil, NSError()); return }
-
-        library.performChanges({
-            if let request = PHAssetChangeRequest.creationRequestForAssetFromImage(atFileURL: filePath) {
-                request.creationDate = Date()
-            }
-        }, completionHandler: { success, error in
-            if error != nil {
-                imageCompletion(nil, NSError())
-                return
-            }
-        })
+        
+        let location = self.locationManager?.latestLocation
+        let date = Date()
+
+        
+        library!.save(imageAtURL: filePath, albumName: self.imageAlbumName, date: date, location: location) { _ in
+            imageCompletion(nil, nil)
+        }
+        
     }
     
     /**

        return AVCaptureDevice.devices(for: AVMediaType.video)
    }
}

    }
    
    fileprivate func _saveVideoToLibrary(_ fileURL: URL) {
        
        let location = self.locationManager?.latestLocation
        let date = Date()
        
        library?.save(videoAtURL: fileURL, albumName: self.videoAlbumName, date: date, location: location, completion: { _ in
            self._executeVideoCompletionWithURL(nil, error: nil)
        })

    }
    
    // MARK: - UIGestureRecognizerDelegate
