diff --git a/hw3/src/PhotoAlbumApp.java b/hw3/src/PhotoAlbumApp.java
index 4390dad..6da1d8c 100644
--- a/hw3/src/PhotoAlbumApp.java
+++ b/hw3/src/PhotoAlbumApp.java
@@ -6,7 +6,7 @@ import view.PhotoAlbumView;
 public class PhotoAlbumApp {
     public static void main(String[] args) {
         // Create MVC components
-        PhotoAlbumModel model = new PhotoAlbumModel(new SortByDate());
+        PhotoAlbumModel model = new PhotoAlbumModel();
         PhotoAlbumView view = new PhotoAlbumView();
         PhotoAlbumController controller = new PhotoAlbumController(model, view);
 
diff --git a/hw3/src/controller/PhotoAlbumController.java b/hw3/src/controller/PhotoAlbumController.java
index 62480f5..a67e16f 100644
--- a/hw3/src/controller/PhotoAlbumController.java
+++ b/hw3/src/controller/PhotoAlbumController.java
@@ -11,7 +11,6 @@ import javax.swing.*;
 import javax.swing.filechooser.FileNameExtensionFilter;
 import java.io.File;
 import java.util.Date;
-import java.util.List;
 
 public class PhotoAlbumController {
     private final PhotoAlbumModel model;
@@ -78,12 +77,4 @@ public class PhotoAlbumController {
                 break;
         }
     }
-
-    public void handlePhotoSelection(int index) {
-        // Reset iterator and loop to the selected index
-        List<Photo> photos = model.getPhotos();
-        for (int i = 0; i < index; i++) {
-            model.next();
-        }
-    }
 }
diff --git a/hw3/src/model/PhotoAlbumModel.java b/hw3/src/model/PhotoAlbumModel.java
index 4b106bf..78eb527 100644
--- a/hw3/src/model/PhotoAlbumModel.java
+++ b/hw3/src/model/PhotoAlbumModel.java
@@ -15,11 +15,10 @@ public class PhotoAlbumModel {
         void onModelChanged();
     }
 
-    public PhotoAlbumModel(SortingStrategy<Photo> sortingStrategy) {
+    public PhotoAlbumModel() {
         photos = new ArrayList<>();
         listeners = new ArrayList<>();
         iterator = new PhotoIterator(photos);
-        this.sortingStrategy = sortingStrategy;
     }
 
     public void addPhoto(Photo photo) {
@@ -48,7 +47,10 @@ public class PhotoAlbumModel {
     }
 
     private void sortPhotos() {
-        photos = sortingStrategy.sort(photos);
+        if (sortingStrategy != null) {
+            photos = sortingStrategy.sort(photos);
+            iterator = new PhotoIterator(photos);
+        }
     }
 
     public void addListener(ModelChangeListener listener) {