diff --git a/Favorite_Movies/bin/Database.class b/Favorite_Movies/bin/Database.class
index 245fa2e..3d01526 100644
Binary files a/Favorite_Movies/bin/Database.class and b/Favorite_Movies/bin/Database.class differ
diff --git a/Favorite_Movies/bin/Main_HomePage$1.class b/Favorite_Movies/bin/Main_HomePage$1.class
index 187ef93..3ed2ecb 100644
Binary files a/Favorite_Movies/bin/Main_HomePage$1.class and b/Favorite_Movies/bin/Main_HomePage$1.class differ
diff --git a/Favorite_Movies/bin/Main_HomePage$2.class b/Favorite_Movies/bin/Main_HomePage$2.class
index b3605ec..39ce65f 100644
Binary files a/Favorite_Movies/bin/Main_HomePage$2.class and b/Favorite_Movies/bin/Main_HomePage$2.class differ
diff --git a/Favorite_Movies/bin/Main_HomePage$3.class b/Favorite_Movies/bin/Main_HomePage$3.class
index c031dbe..a8b605a 100644
Binary files a/Favorite_Movies/bin/Main_HomePage$3.class and b/Favorite_Movies/bin/Main_HomePage$3.class differ
diff --git a/Favorite_Movies/bin/Main_HomePage$4.class b/Favorite_Movies/bin/Main_HomePage$4.class
index c56f339..25328eb 100644
Binary files a/Favorite_Movies/bin/Main_HomePage$4.class and b/Favorite_Movies/bin/Main_HomePage$4.class differ
diff --git a/Favorite_Movies/bin/Main_HomePage.class b/Favorite_Movies/bin/Main_HomePage.class
index f74c868..88634f7 100644
Binary files a/Favorite_Movies/bin/Main_HomePage.class and b/Favorite_Movies/bin/Main_HomePage.class differ
diff --git a/Favorite_Movies/bin/files/data.txt b/Favorite_Movies/bin/files/data.txt
index d2c3747..feebac2 100644
--- a/Favorite_Movies/bin/files/data.txt
+++ b/Favorite_Movies/bin/files/data.txt
@@ -1,3 +1,3 @@
-1,finding neemo,2016,01:56,Comic,Disney,sdf,neemo,5.6,2
-2,Lion King,2016,01:46,Animation,Disney,jk,LK,4.2,3
-1 gandara 2022 10 melody soju jay song 5.9 5
+1 finding_neemo 2016 120 Comic Disney sdf neemo 5.6 2
+2 Lion_King 2016 96 Animation Disney jk LK 4.2 3
+3 gandara 2022 100 melody soju jay song 5.9 5
\ No newline at end of file
diff --git a/Favorite_Movies/src/Database.java b/Favorite_Movies/src/Database.java
index b3b46e9..d15a3c7 100644
--- a/Favorite_Movies/src/Database.java
+++ b/Favorite_Movies/src/Database.java
@@ -42,13 +42,13 @@ public class Database {
     private static void writeMovieToFile(FileWriter fw, Movie m) throws IOException
     {
 
-        fw.write(m.getMovieId()); 
+        fw.write(String.valueOf(m.getMovieId())); 
 
         fw.append(" ").write(m.getTitle());
 
-        fw.append(" ").write(m.getYear());
+        fw.append(" ").write(String.valueOf(m.getYear()));
         
-        fw.append(" ").write(m.getLength());
+        fw.append(" ").write(String.valueOf(m.getLength()));
         
         fw.append(" ").write(m.getGenre());
         
@@ -60,7 +60,7 @@ public class Database {
         
         fw.append(" ").write(String.valueOf(m.getAvgRating())); 
         
-        fw.append(" ").write(m.getNumWatched());
+        fw.append(" ").write(String.valueOf(m.getNumWatched()));
         
         fw.write("\n");
     }
diff --git a/Favorite_Movies/src/Movie.java b/Favorite_Movies/src/Movie.java
index a4f26be..1f2cb88 100644
--- a/Favorite_Movies/src/Movie.java
+++ b/Favorite_Movies/src/Movie.java
@@ -97,6 +97,14 @@ public class Movie {
         Movie m = new Movie();
         m.setMovieId(Integer.parseInt(parts[0]));
         m.setTitle(parts[1]);
+        m.setYear(Integer.parseInt(parts[2]));
+        m.setLength(Integer.parseInt(parts[3]));
+        m.setGenre(parts[4]);
+        m.setStudioName(parts[5]);
+        m.setProducerName(parts[6]);
+        m.setShortDescription(parts[7]);
+        m.setAvgRating(Double.parseDouble(parts[8]));
+        m.setNumWatched(Integer.parseInt(parts[9]));
         // TODO 10: populate rest of the fields
         return m;
     }
diff --git a/Favorite_Movies/src/files/data.txt b/Favorite_Movies/src/files/data.txt
index d2c3747..feebac2 100644
--- a/Favorite_Movies/src/files/data.txt
+++ b/Favorite_Movies/src/files/data.txt
@@ -1,3 +1,3 @@
-1,finding neemo,2016,01:56,Comic,Disney,sdf,neemo,5.6,2
-2,Lion King,2016,01:46,Animation,Disney,jk,LK,4.2,3
-1 gandara 2022 10 melody soju jay song 5.9 5
+1 finding_neemo 2016 120 Comic Disney sdf neemo 5.6 2
+2 Lion_King 2016 96 Animation Disney jk LK 4.2 3
+3 gandara 2022 100 melody soju jay song 5.9 5
\ No newline at end of file
diff --git a/ReadMe.txt b/ReadMe.txt
index 2a53601..ee0947e 100644
--- a/ReadMe.txt
+++ b/ReadMe.txt
@@ -1,3 +1,7 @@
+Mac:
+1. fixed numWatched
+2. updated data file to have only one space per field, fields with values having space should use Lion_King
+
 Mac:
 1. updated Database
 2. updated ShowMovieFrame to display movieid if found