diff --git a/app/src/main/java/school_project/Piece.java b/app/src/main/java/school_project/Piece.java
index 7ce450e..29ee035 100644
--- a/app/src/main/java/school_project/Piece.java
+++ b/app/src/main/java/school_project/Piece.java
@@ -55,6 +55,8 @@ public class Piece extends Shape{
      */
     public void RotateRight(int times){
         while(times > 0) {
+            height = matrix.length;
+            width = matrix[0].length;
             boolean[][] temp_matrix = new boolean[width][height];
             for (int i = 0; i < width; i++) {
                 for (int j = 0; j < height; j++) {
@@ -70,9 +72,10 @@ public class Piece extends Shape{
     public boolean equals(Object obj) {
         if(obj instanceof Piece){
             Piece pieceObj = (Piece) obj;
-            if( pieceObj.getPosition().equals(this.getPosition()) && pieceObj.getShape().equals(getShape())) {
-                return true;
+            if (pieceObj.getPosition() != null && this.getPosition() != null){
+                return pieceObj.getPosition().equals(this.getPosition()) && pieceObj.getShape().equals(getShape());
             }
+            return pieceObj.getShape().equals(getShape());
         }
         return false;
     }
diff --git a/app/src/main/java/school_project/Shape.java b/app/src/main/java/school_project/Shape.java
index 3a436d6..d6fbd6d 100644
--- a/app/src/main/java/school_project/Shape.java
+++ b/app/src/main/java/school_project/Shape.java
@@ -1,6 +1,8 @@
 package school_project;
 
 
+import school_project.Utils.Array;
+
 import java.io.Serializable;
 
 /**
@@ -21,14 +23,52 @@ public class Shape implements Serializable, Cloneable{
     }
 
     public void setShape(boolean[][] matrix) throws IllegalArgumentException{
-        height = matrix.length;
-        width = matrix[0].length;
 
         for (boolean[] row: matrix){
-            if(row.length != width){
+            if(row.length != matrix[0].length){
                 throw new IllegalArgumentException("The argument should be a square matrix");
             }
         }
+
+        for (int i = 0; i < matrix.length; i++) {
+            if(!Array.isRowOnlyFalse(matrix, i)) {
+                for (int j = 0; j < i; j++) {
+                    matrix = Array.MatrixRemoveRow(matrix, 0);
+                }
+                break;
+            }
+        }
+
+        for (int i = matrix.length-1; i >= 0; i--) {
+            if(!Array.isRowOnlyFalse(matrix, i)) {
+                for (int j = matrix.length-1; j > i; j--) {
+                    matrix = Array.MatrixRemoveRow(matrix, j);
+                }
+                break;
+            }
+        }
+
+        for (int i = 0; i < matrix[0].length; i++) {
+            if(!Array.isColumnOnlyFalse(matrix, i)) {
+                for (int j = 0; j < i; j++) {
+                    matrix = Array.MatrixRemoveColumn(matrix, 0);
+                }
+                break;
+            }
+        }
+
+        for (int i = matrix[0].length-1; i >= 0; i--){
+            if(!Array.isColumnOnlyFalse(matrix, i)) {
+                for (int j = matrix[0].length-1; j > i; j--) {
+                    matrix = Array.MatrixRemoveColumn(matrix, j);
+                }
+                break;
+            }
+        }
+
+        height = matrix.length;
+        width = matrix[0].length;
+
         this.matrix = matrix;
     }
 
diff --git a/app/src/main/java/school_project/Utils/Array.java b/app/src/main/java/school_project/Utils/Array.java
index 872cb45..5de668f 100644
--- a/app/src/main/java/school_project/Utils/Array.java
+++ b/app/src/main/java/school_project/Utils/Array.java
@@ -17,6 +17,8 @@ public class Array{
         for (int i = 0; i < o.length; i++) {
             if(i == row)
                 i++;
+            if(i >= o.length)
+                continue;
             newMatrix[newRow] = o[i];
             newRow++;
         }
@@ -30,6 +32,8 @@ public class Array{
             for(int j = 0; j < o[0].length; j++){
                 if(j == col)
                     j++;
+                if(j >= o[0].length)
+                    continue;
                 newMatrix[i][newCol] = o[i][j];
                 newCol++;
             }
diff --git a/app/src/test/java/school_project/PieceTest.java b/app/src/test/java/school_project/PieceTest.java
index 6e80749..b78d371 100644
--- a/app/src/test/java/school_project/PieceTest.java
+++ b/app/src/test/java/school_project/PieceTest.java
@@ -17,7 +17,6 @@ class PieceTest {
         boolean[][] piece1_matrix_result = {
                 {true, false, true},
                 {true, true, false},
-                {false, false, false},
         };
 
         boolean[][] piece2_matrix = {
@@ -31,7 +30,6 @@ class PieceTest {
         };
 
         boolean[][] piece3_matrix_result = {
-                {false, false, false},
                 {false, true, true},
                 {true, false, true},
         };
diff --git a/app/src/test/java/school_project/ShapeTest.java b/app/src/test/java/school_project/ShapeTest.java
index c5e6fd3..88377b3 100644
--- a/app/src/test/java/school_project/ShapeTest.java
+++ b/app/src/test/java/school_project/ShapeTest.java
@@ -1,6 +1,9 @@
 package school_project;
 
 import org.junit.jupiter.api.Test;
+import school_project.Utils.Array;
+
+import java.util.Arrays;
 
 import static org.junit.jupiter.api.Assertions.*;
 
@@ -29,6 +32,30 @@ class ShapeTest {
                 {true}
         };
 
+        boolean[][] matrix_shape5 = {
+                {false, false, false, false, false},
+                {false, false, false, false, false},
+                {false, true, true, true, false},
+                {false, true, false, true, false},
+                {false, false, false, false, false},
+                {false, false, false, false, false},
+        };
+
+        boolean[][] matrix_shape5_result = {
+                {true, true, true},
+                {true, false, true},
+        };
+
+        boolean[][] matrix_shape6 = {
+                {true, false},
+                {false, false}
+        };
+
+        boolean[][] matrix_shape6_result = {
+                {true},
+        };
+
+        System.out.println(Array.isRowOnlyFalse(matrix_shape1, 0));
         Shape shape1 = new Shape();
         shape1.setShape(matrix_shape1);
         assertEquals(3, shape1.getHeight());
@@ -44,5 +71,11 @@ class ShapeTest {
         assertEquals(3, shape4.getHeight());
         assertEquals(1, shape4.getWidth());
 
+        Shape shape5 = new Shape(matrix_shape5);
+        assertArrayEquals(matrix_shape5_result, shape5.getShape());
+
+        Shape shape6 = new Shape(matrix_shape6);
+        assertArrayEquals(matrix_shape6_result, shape6.getShape());
+
     }
 }
\ No newline at end of file