diff --git a/astar.py b/astar.py
index 4c66812..2ccdb47 100644
--- a/astar.py
+++ b/astar.py
@@ -42,12 +42,12 @@ def astar(obiekty, start, cel):
                 continue
             elif 6 <= sasiad[0] <= 7 and 10 <= sasiad[1] <= 11:
                 continue
-            tentative_g_score = gscore[current] + \
-                heurystyka(obiekty, current, sasiad)
+            tentative_h_score = heurystyka(
+                obiekty, sasiad, cel) + heurystyka(obiekty, current, sasiad)
 
-            if sasiad in close_set and tentative_g_score >= gscore.get(sasiad, 0):
+            if sasiad in [i[1] for i in oheap] and tentative_h_score < hscore.get(current, 0):
                 continue
-            if sasiad not in close_set and sasiad not in [i[1] for i in oheap]:
+            elif sasiad not in close_set and sasiad not in [i[1] for i in oheap]:
                 came_from[sasiad] = current
                 hscore[sasiad] = tentative_h_score
                 fscore[sasiad] = tentative_h_score + gscore[current]
diff --git a/modele.py b/modele.py
index 10f48c1..4f6ab88 100644
--- a/modele.py
+++ b/modele.py
@@ -64,7 +64,6 @@ class Smieciarka(pygame.sprite.Sprite):
                     self.w_gore()
                 elif koord[0] == self.x and koord[1] - 1 == self.y:
                     self.w_dol()
-        print("skonczylem")
 
     def w_lewo(self):
         if self.x > 0: