diff --git a/GHEtool/Examples/test_short_term_effects.py b/GHEtool/Examples/test_short_term_effects.py
index fc18d24e..233518ec 100644
--- a/GHEtool/Examples/test_short_term_effects.py
+++ b/GHEtool/Examples/test_short_term_effects.py
@@ -8,6 +8,7 @@
 sys.path.append("C:\Workdir\Develop\ghetool")
 
 from GHEtool import *
+import matplotlib.pyplot as plt
 import numpy as np
 import pygfunction as gt
 import time
@@ -21,7 +22,7 @@ def test_short_term_effects():
     pipe_data = MultipleUTube(r_in=0.0137, r_out=0.0167, D_s=0.075 / 2, k_g=1.4, k_p=0.43, number_of_pipes=1)
     # Addidional input data needed for short-term model
     fluid_factor = 1 # 2 by default, make function to calculate this
-    x = 1 # 1 by default, parameter to modify final time 
+    x = 50 # 1 by default, parameter to modify final time 
     u_tube = 1 # 1 for single U tube, 2 for dubble U tube (not yet possible) 
     rho_cp_grout = 3800000.0  # 3800000.0 by default
     rho_cp_pipe = 1800000.0  # 1800000.0 by default
@@ -79,8 +80,11 @@ def test_short_term_effects():
     depth_L4 = borefield.size(100, L4_sizing=True)
     L4_stop = time.time()
 
+    
+
     print("The sizing according to L4 took", round((L4_stop - L4_start) * 1000, 4), "ms and was", depth_L4, "m.")
 
+    plt.show()
 
 if __name__ == "__main__":
     test_short_term_effects()
\ No newline at end of file
diff --git a/GHEtool/VariableClasses/Dynamic_borhole_model.py b/GHEtool/VariableClasses/Dynamic_borhole_model.py
index 86af727e..8ceffb13 100644
--- a/GHEtool/VariableClasses/Dynamic_borhole_model.py
+++ b/GHEtool/VariableClasses/Dynamic_borhole_model.py
@@ -9,6 +9,7 @@
 from scipy.linalg.lapack import dgtsv
 
 import pygfunction as gt
+from GHEtool.logger.ghe_logger import ghe_logger
 
 class CellProps(IntEnum):
     R_IN = 0
@@ -37,6 +38,10 @@ def __init__(self, time, gFunc, boreholes, alpha, ground_data, fluid_data, pipe_
         self.pipes_gt = gt.pipes
         self.short_term_effects_parameters = short_term_effects_parameters
         self.borefield = borefield
+        self.gFunc = gFunc
+        self.time = time
+
+        self.g_lt = interp1d(self.time, self.gFunc)
 
         # make function based on number of boreholes (1 or more) and half of the distance between boreholes
         number_of_boreholes = len(self.boreholes)
@@ -127,6 +132,7 @@ def __init__(self, time, gFunc, boreholes, alpha, ground_data, fluid_data, pipe_
         self.calc_time_in_sec = max([self.t_s * exp(-8.6), 49.0 * 3600.0])
         self.t_b = 5 * (self.boreholes[0].r_b) ** 2 / self.ground_ghe.alpha()  
         self.final_time = self.x * self.t_b
+        print("final time in second", self.final_time, "final time in hours", self.final_time/3600)
   
         self.g_sts = None
 
@@ -345,6 +351,8 @@ def calc_sts_g_functions(self, final_time=None) -> tuple:
         gFunc_CHS = []
         g_comb_comp = []
         g_comp =[]
+        g_test = []
+        threshold_steady_state = []
 
         _dl = np.zeros(self.num_cells - 1)
         _d = np.zeros(self.num_cells)
@@ -427,15 +435,13 @@ def fill_f2(fx_2, cell):
             g.append(self.c_0 * ((radial_cell[CellProps.TEMP, 0] - init_temp) / heat_flux - self.resist_bh_effective))
             g_comb.append(self.c_0 * ((radial_cell[CellProps.TEMP, 0] - radial_cell[CellProps.TEMP, self.bh_wall_idx]) / heat_flux - self.resist_bh_effective))
             g_plot.append(self.c_0 * ((radial_cell[CellProps.TEMP, 0] - init_temp) / heat_flux))
-
-            threshold_steady_state = 1- (self.resist_bh_effective - (radial_cell[CellProps.TEMP, 0]-radial_cell[CellProps.TEMP, self.bh_wall_idx]))
             qb.append(1- (self.resist_bh_effective - (radial_cell[CellProps.TEMP, 0]-radial_cell[CellProps.TEMP, self.bh_wall_idx])))
-
             gFunc_CHS.append(2*np.pi*gt.heat_transfer.cylindrical_heat_source(time, self.ground_ghe.alpha(), self.boreholes[0].r_b,self.boreholes[0].r_b))
-            g_comp.append(self.c_0 * ((radial_cell[CellProps.TEMP, 0] - init_temp) / heat_flux - self.resist_bh_effective))
 
-            print('CHS', gFunc_CHS, len(gFunc_CHS))
-            print('g ', g_comp, len(g_comp))
+            if time > 3600:
+                stop_crit = self.g_lt(time) - self.c_0 * ((radial_cell[CellProps.TEMP, 0] - init_temp) / heat_flux - self.resist_bh_effective)
+            else:
+                stop_crit = 1
         
             T0 = radial_cell[CellProps.TEMP, 0]
             TBH = radial_cell[CellProps.TEMP, self.bh_wall_idx]
@@ -448,14 +454,37 @@ def fill_f2(fx_2, cell):
             lntts.append(time)
             plottime.append(time)
 
-            """
-            if threshold_steady_state > 1 or time >= final_time - time_step:
+          
+            if stop_crit < 0 or time >= (final_time - time_step):
+                if stop_crit < 0:
+                    ghe_logger.info(f"Perfect convergence with long-term g-function after {time/3600} hours")
+                    
+                else:
+                    ghe_logger.info(f"No perfect convergence between long-term and short term g-functions, switch made after {time/3600} hours")
                 break
-            """
             
+
+
+            """
             if time >= final_time - time_step:
                 break
-       
+            """
+
+        fig = plt.figure()
+        ax1 = fig.add_subplot(111)
+
+        plt.tight_layout()
+
+        ax1.plot(self.time, self.gFunc, c='b', marker="s", label='lt')
+        ax1.plot(lntts,g, c='r', marker="o", label='g')
+        #ax1.plot(lntts,threshold_steady_state, c='g', marker="o", label='g test')
+        ax1.plot(lntts,g_comb, c='c', marker="o", label='g comb')
+        ax1.plot(lntts,gFunc_CHS, c='y', marker="o", label='g chs')
+
+
+        plt.legend(loc='upper left')
+         
+
         # quickly chop down the total values to a more manageable set
         num_intervals = int(self.x * 30)
         g_tmp = interp1d(lntts, g)