diff --git a/hw5/ooc.py b/hw5/ooc.py
index e1ce703..8d1990c 100644
--- a/hw5/ooc.py
+++ b/hw5/ooc.py
@@ -114,14 +114,15 @@ class MemoryLimitedHashMap(object):
         line = f.readline()
 
   
-  def loadAll(self, subkey=""):
+  def loadAll(self, subkey="", includeMemory=False):
     '''
     Streams all of the data from all keys
     '''
 
-    for k in self.keys():
-        yield (k, self.get(k))
+    if includeMemory:
+        for k in self.keys():
+            yield (k, self.get(k))
 
-    for k in self.fKeys():
+    for k in self.flushed():
         for _,v in self.load(k, subkey):
             yield (k,v)
\ No newline at end of file