diff --git a/CM2005 Object Oriented Programming/Midterm/Merkelrex-TradingBot/MerkelMain.cpp b/CM2005 Object Oriented Programming/Midterm/Merkelrex-TradingBot/MerkelMain.cpp
index ff9c909..63c7e69 100644
--- a/CM2005 Object Oriented Programming/Midterm/Merkelrex-TradingBot/MerkelMain.cpp	
+++ b/CM2005 Object Oriented Programming/Midterm/Merkelrex-TradingBot/MerkelMain.cpp	
@@ -170,9 +170,10 @@ void MerkelMain::printWallet()
     std::cout << wallet.toString() << std::endl;
 }
 
-void MerkelMain::gotoNextTimeframe()
+void MerkelMain::gotoNextTimeframe(bool silent)
 {
-    std::cout << "Going to next time frame. " << std::endl;
+    if(!silent)
+        std::cout << "Going to next time frame. " << std::endl;
     for (std::string p : orderBook.getKnownProducts())
     {
         std::cout << "matching " << p << std::endl;
@@ -180,7 +181,8 @@ void MerkelMain::gotoNextTimeframe()
         std::cout << "Sales: " << sales.size() << std::endl;
         for (OrderBookEntry &sale : sales)
         {
-            std::cout << "Sale price: " << sale.price << " amount " << sale.amount << std::endl;
+            if(!silent)
+                std::cout << "Sale price: " << sale.price << " amount " << sale.amount << std::endl;
             if (sale.username == "simuser")
             {
                 // update the wallet
@@ -238,7 +240,7 @@ void MerkelMain::processUserOption(int userOption)
     }
     if (userOption == 6)
     {
-        gotoNextTimeframe();
+        gotoNextTimeframe(false);
     }
 }
 
diff --git a/CM2005 Object Oriented Programming/Midterm/Merkelrex-TradingBot/MerkelMain.h b/CM2005 Object Oriented Programming/Midterm/Merkelrex-TradingBot/MerkelMain.h
index f9b521f..437d160 100644
--- a/CM2005 Object Oriented Programming/Midterm/Merkelrex-TradingBot/MerkelMain.h	
+++ b/CM2005 Object Oriented Programming/Midterm/Merkelrex-TradingBot/MerkelMain.h	
@@ -22,22 +22,26 @@ public:
     /** returns a vector of all bids orders for the current time */
     std::vector<OrderBookEntry> getCurrentBids();
 
-    void enterAsk();
+    /** matches bids and asks, proceeds to the next time frame */
+    void gotoNextTimeframe(bool silent);
+    void enterAsk(OrderBookEntry newAsk);
+    void enterBid(OrderBookEntry newBid);
 private:
     void printMenu();
     void printHelp();
     void printMarketStats();
-
+    void enterAsk();
     void enterBid();
     void printWallet();
-    void gotoNextTimeframe();
+    
     int getUserOption();
     void init(); // initialization function for user interaction
     void processUserOption(int userOption);
 
     std::string currentTime;
 
-    OrderBook orderBook{"20200317.csv"};
+    OrderBook orderBook{"../../../../111.csv"};
+    //OrderBook orderBook{"20200317.csv"};
     //OrderBook orderBook{"20200601.csv"};
     Wallet wallet;
 };