diff --git a/main.py b/main.py
index f3f31a8..fd42a09 100644
--- a/main.py
+++ b/main.py
@@ -1,6 +1,8 @@
-from collections import deque
+# from collections import deque
+from queue import PriorityQueue
 
-from path_algorithms.bfs import bfs
+from path_algorithms.a_star import a_star
+# from path_algorithms.bfs import bfs
 from truck import Truck
 from surface import *
 
@@ -8,9 +10,9 @@ RESOLUTION = 900
 SIZE = 60
 
 # matrix for display
-matrix = [[1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1],
+matrix = [[1, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1],
+          [1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1],
           [1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1],
-          [1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1],
           [1, 1, 3, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1],
           [1, 1, 3, 1, 2, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1],
           [1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1],
@@ -40,6 +42,8 @@ for i in range(15):
 
 run = 1
 path = []
+start = truck.state
+direction = truck.direction
 while True:
     pygame.time.delay(500)
 
@@ -51,7 +55,8 @@ while True:
         start = truck.state
         direction = truck.direction
         endpoint = (0, 5)
-        path = bfs(surface_list, endpoint).tree_search(deque(), start, direction)
+        # path = bfs(surface_list, endpoint).tree_search(deque(), start, direction)
+        path = a_star(surface_list, endpoint).tree_search(PriorityQueue(), start, direction)
         print(path)
         run = 0
 
diff --git a/path_algorithms/a_star.py b/path_algorithms/a_star.py
index b1e23e5..75d22e8 100644
--- a/path_algorithms/a_star.py
+++ b/path_algorithms/a_star.py
@@ -6,7 +6,7 @@ def get_path(cond):
     return list(reversed(path))
 
 
-class bfs:
+class a_star:
     def __init__(self, surface_list, endpoint):
         self.surface_list = surface_list
         self.endpoint = endpoint
@@ -14,12 +14,32 @@ class bfs:
     def goal_achieved(self, state):
         return state == self.endpoint
 
+    # checking borders and impassable surface
     def limitation_check(self, x, y):
         for surface in self.surface_list:
-            if (surface.weight == 1) and (surface.y/60 == x) and (surface.x/60 == y):
+            if (surface.y / 60 == x) and (surface.x / 60 == y) and (surface.weight != 3):
                 return True
         return False
 
+    # finding surface depending on coordinates
+    def current_surface(self, x, y):
+        for surface in self.surface_list:
+            if (x == surface.y / 60) and (y == surface.x / 60):
+                return surface
+        return None
+
+    # manhattan distance
+    def h(self, current):
+        return abs(current[0] - self.endpoint[0]) + abs(current[1] - self.endpoint[1])
+
+    # cost relative to surface weight
+    def g(self, cond):
+        if cond.action == 'L' or cond.action == 'R':
+            cond.weight = cond.parent.weight
+        else:
+            cond.weight = cond.parent.weight + self.current_surface(cond.state[0], cond.state[1]).weight
+        return cond.weight
+
     def add_all_possibilities(self, current):
         states = []
         if current.direction == 'L':
@@ -84,17 +104,23 @@ class bfs:
         return states
 
     def tree_search(self, queue, start, direction):
-        queue.append(condition(start, direction))
+        explored = []
+        queue.put(condition(start, direction), 0)
         while queue:
-            elem = queue.popleft()
+            elem = queue.get()
 
             if self.goal_achieved(elem.state):
                 return get_path(elem)
 
+            explored.append(elem)
+
             for state in self.add_all_possibilities(elem):
-                if state not in queue:
-                    state.parent = elem
-                    queue.append(state)
+                state.parent = elem
+                f = self.h(state.state) + self.g(state)
+                if state not in queue.queue and state not in explored:
+                    queue.put(state, state.weight)
+                elif state in queue.queue and state.weight > f:
+                    queue.replace(state, f)
 
 
 class condition:
@@ -103,10 +129,22 @@ class condition:
         self.parent = None
         self.action = None
         self.direction = direction
-        self.cost = 0
+        self.weight = 0
 
     def __eq__(self, other):
         if isinstance(other, condition):
             return (self.state == other.state and
                     self.action == other.action and
                     self.direction == other.direction)
+
+    def __lt__(self, other):
+        return self.weight < other.weight
+
+    def __gt__(self, other):
+        return self.weight > other.weight
+
+    def __le__(self, other):
+        return self.weight <= other.weight
+
+    def __ge__(self, other):
+        return self.weight >= other.weight
diff --git a/surface.py b/surface.py
index f9ebc76..ea8d8b2 100644
--- a/surface.py
+++ b/surface.py
@@ -29,7 +29,7 @@ class Rock(Surface):
 
     def __init__(self, screen, x, y):
         super().__init__(screen, x, y)
-        self.weight = 2
+        self.weight = 50
         self.image = pygame.image.load('images/rock.png')