diff --git a/DM.py b/DM.py
index f9bf3cf..580e5da 100644
--- a/DM.py
+++ b/DM.py
@@ -1,7 +1,7 @@
 import time
 
 class DM:
-    def __init__(self, max_history_length=3):
+    def __init__(self, max_history_length=2):
         self.working_history_sep = ""
         self.working_history_consec = ""
         self.chitchat_history_consec = ""
@@ -17,7 +17,7 @@ class DM:
         chat = []
         for utt in self.chat_history:
             if utt['intent'] == 'CHITCHAT':
-                if len(chat) == 8:
+                if len(chat) == 4:
                     chat = chat[1:]
                 chat.append(utt['modified_query'])
         self.chitchat_history_consec = '. '.join(chat)
diff --git a/Recommender.py b/Recommender.py
index 6ecedde..1b4b9c3 100644
--- a/Recommender.py
+++ b/Recommender.py
@@ -9,7 +9,7 @@ class Recommender:
         self.retriever = retriever
         self.rand_seed = 5
 
-    def _new(self, material):
+    def _new(self, username, material):
       if username not in curr_recommendations:
           return True
       for row in self.curr_recommendations[username]:
@@ -22,7 +22,7 @@ class Recommender:
         for tag in material['tags']:
             if cosine_similarity(np.array(self.retriever.encode([tag])),
                                  np.array(self.retriever.encode([interest]))) > score:
-                if self._new(material):
+                if self._new(username, material):
                     print('hi')
                     self.curr_recommendations[username] = self.curr_recommendations[username].append(material) if username not in self.curr_recommendations else [material]
                     self.recommended[username] = self.recommended[username].append(False) if username not in self.recommended else [False]
diff --git a/ResponseGenerator.py b/ResponseGenerator.py
index 3c63e5c..6700a83 100644
--- a/ResponseGenerator.py
+++ b/ResponseGenerator.py
@@ -132,7 +132,7 @@ class ResponseGenerator:
         elif action == "ConvGen":
             gen_kwargs = {"length_penalty": 2.5, "num_beams":2, "max_length": 30, "repetition_penalty": 2.5, "temperature": 2}
             #answer = self.generators['chat']('history: '+ consec_history + ' ' + utterance + ' persona: ' + 'I am Janet. My name is Janet. I am an AI developed by CNR to help VRE users.' , **gen_kwargs)[0]['generated_text']
-            answer = self.generators['chat']('question: ' + utterance + 'context: My name is Janet. I am an AI developed by CNR to help VRE users. ' + chitchat_history  , **gen_kwargs)[0]['generated_text']
+            answer = self.generators['chat']('question: ' + utterance + ' context: My name is Janet. I am an AI developed by CNR to help VRE users. ' + chitchat_history  , **gen_kwargs)[0]['generated_text']
             return answer
     
         elif action == "findPaper":
diff --git a/main.py b/main.py
index f6ee6a8..db59f9a 100644
--- a/main.py
+++ b/main.py
@@ -29,7 +29,7 @@ cors = CORS(app, resources={r"/api/predict": {"origins": url},
                             r"/api/dm": {"origins": url},
                             r"/health": {"origins": "*"}
                            })
-"""
+
 conn = psycopg2.connect(
 	host="janet-pg",
         database=os.getenv("POSTGRES_DB"),
@@ -37,7 +37,7 @@ conn = psycopg2.connect(
         password=os.getenv("POSTGRES_PASSWORD"))
 
 cur = conn.cursor()
-"""
+
 users = {}
 
 def vre_fetch():
@@ -133,7 +133,7 @@ def predict():
 def feedback():
     data = request.get_json().get("feedback")
     print(data)
-    """
+    
     cur.execute('INSERT INTO feedback_experimental (query, history, janet_modified_query, is_modified_query_correct, user_modified_query, evidence_useful, response, preferred_response, response_length_feedback, response_fluency_feedback, response_truth_feedback, response_useful_feedback, response_time_feedback, response_intent) VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s)',
             (data['query'], data['history'], data['modQuery'],
              data['queryModCorrect'], data['correctQuery'], data['evidence'], data['janetResponse'], data['preferredResponse'], data['length'],
@@ -141,7 +141,7 @@ def feedback():
              data['speed'], data['intent'])
             )
     conn.commit()
-    """
+    
     reply = jsonify({"status": "done"})
     return reply
 
@@ -185,7 +185,7 @@ if __name__ == "__main__":
 
     rg = ResponseGenerator(index,db, rec, generators, retriever)
 
-    """
+    
     cur.execute('CREATE TABLE IF NOT EXISTS feedback_experimental (id serial PRIMARY KEY,'
                                  'query text NOT NULL,'
                                  'history text NOT NULL,'
@@ -202,5 +202,5 @@ if __name__ == "__main__":
                                  'response_intent text NOT NULL);'
                                  )
     conn.commit()
-    """
+    
     app.run(host='0.0.0.0')