diff --git a/ArmoredVehicle/DrawningObject.cs b/ArmoredVehicle/DrawningObject.cs
index 694b52a..ee45c33 100644
--- a/ArmoredVehicle/DrawningObject.cs
+++ b/ArmoredVehicle/DrawningObject.cs
@@ -70,8 +70,11 @@
                 {
                     return false;
                 }
-            }else return false;
-            
+            }else if (machine is TankEnity || otherMachineMachine is TankEnity)
+            {
+                return false;
+            }    
+
             return true;
         }
     }
diff --git a/ArmoredVehicle/MachineCompareByColor.cs b/ArmoredVehicle/MachineCompareByColor.cs
index 53947fb..f7023ce 100644
--- a/ArmoredVehicle/MachineCompareByColor.cs
+++ b/ArmoredVehicle/MachineCompareByColor.cs
@@ -34,18 +34,16 @@
             {
                 return 0;
             }
-            if (xCar.GetMachine.ArmoredVehicle.BodyColor.R > yCar.GetMachine.ArmoredVehicle.BodyColor.R)
+            if (xCar.GetMachine.ArmoredVehicle.BodyColor.R.CompareTo(yCar.GetMachine.ArmoredVehicle.BodyColor.R) == 0)
             {
-                if (xCar.GetMachine.ArmoredVehicle.BodyColor.G > yCar.GetMachine.ArmoredVehicle.BodyColor.G)
+                if (xCar.GetMachine.ArmoredVehicle.BodyColor.R.CompareTo(yCar.GetMachine.ArmoredVehicle.BodyColor.R) == 0)
                 {
-                    if (xCar.GetMachine.ArmoredVehicle.BodyColor.B > yCar.GetMachine.ArmoredVehicle.BodyColor.B)
-                    {
-                        return 1;
-                    }
-                    else return -1;
+                    return xCar.GetMachine.ArmoredVehicle.BodyColor.B.CompareTo(yCar.GetMachine.ArmoredVehicle.BodyColor.B);
                 }
-                else return -1;
-            } else return -1;
+                else return xCar.GetMachine.ArmoredVehicle.BodyColor.G.CompareTo(yCar.GetMachine.ArmoredVehicle.BodyColor.G);
+            }
+            else return xCar.GetMachine.ArmoredVehicle.BodyColor.R.CompareTo(yCar.GetMachine.ArmoredVehicle.BodyColor.R);
+            
         }
     }
 }
\ No newline at end of file
diff --git a/ArmoredVehicle/MachineCompareByType.cs b/ArmoredVehicle/MachineCompareByType.cs
index 2cbded5..6f8fd4e 100644
--- a/ArmoredVehicle/MachineCompareByType.cs
+++ b/ArmoredVehicle/MachineCompareByType.cs
@@ -32,7 +32,7 @@
             }
             if (xMachine.GetMachine.GetType().Name != yMachine.GetMachine.GetType().Name)
             {
-                if (xMachine.GetMachine.GetType().Name == "DrawningCar")
+                if (xMachine.GetMachine.GetType().Name == "DrawingArmoredVehicle")
                 {
                     return -1;
                 }