diff --git a/schainpy/model/graphics/figure.py b/schainpy/model/graphics/figure.py
index c35693a..6665ed5 100644
--- a/schainpy/model/graphics/figure.py
+++ b/schainpy/model/graphics/figure.py
@@ -72,32 +72,27 @@ class Figure:
     
     def getTimeLim(self, x, xmin=None, xmax=None, timerange=None):
         
-        if xmin != None and xmax != None:
+        if self.xmin != None and self.xmax != None:
             if timerange == None:
-                timerange = xmax - xmin
-            xmin = xmin + timerange
-            xmax = xmax + timerange
+                timerange = self.xmax - self.xmin
+            xmin = self.xmin + timerange
+            xmax = self.xmax + timerange
             
             return xmin, xmax
         
         
-        if timerange != None and xmin == None and xmax == None:
+        if timerange != None and self.xmin == None and self.xmax == None:
             txmin = x[0] - x[0]%timerange
         else:
             txmin = numpy.min(x)
-            timerange = 60*60*2
-        
+            timerange = self.timerange
+        thisdatetime = datetime.datetime.utcfromtimestamp(txmin)
+        thisdate = datetime.datetime.combine(thisdatetime.date(), datetime.time(0,0,0))
         if xmin == None and xmax == None:
-            thisdatetime = datetime.datetime.utcfromtimestamp(txmin)
-            thisdate = datetime.datetime.combine(thisdatetime.date(), datetime.time(0,0,0))
             xmin = (thisdatetime - thisdate).seconds/(60*60.)
             xmax = xmin + timerange/(60*60.)
             
         
-        if timerange == None:
-            
-            thisdatetime = datetime.datetime.utcfromtimestamp(txmin)
-            thisdate = datetime.datetime.combine(thisdatetime.date(), datetime.time(0,0,0))
         
         mindt = thisdate + datetime.timedelta(hours=xmin) - datetime.timedelta(seconds=time.timezone)
         xmin_sec = time.mktime(mindt.timetuple())