diff --git a/Image.class.php b/Image.class.php
index e527a07..aa9fa5a 100644
--- a/Image.class.php
+++ b/Image.class.php
@@ -1,6 +1,6 @@
 <?php
 
-class Image extends File
+abstract class Image extends File
 {
     public $width;
     public $height;
diff --git a/Upload.class.php b/Upload.class.php
index 20b779e..061a33f 100644
--- a/Upload.class.php
+++ b/Upload.class.php
@@ -21,7 +21,7 @@ abstract class Upload
      * @throws ErrorException
      * TODO: Рефакторинг: убрать параметр $force_create_variants
      */
-    public static function image($class, $file, $force_create_variants = true, $quality = 87)
+    public static function image($class, $file, $force_create_variants = true, $quality = 95)
     {
         /**
          * @var $image Image
@@ -35,7 +35,6 @@ abstract class Upload
         Image::checkSubClass($class);
         $image = is_object($class) ? $class : new $class;
         $image->original_filename = $file['name'];
-
         $greagwar_image = self::getGreagwarImage($file['tmp_name']);
         self::saveImage($image, $greagwar_image, $class::getMaxWidth(), $class::getMaxHeight(), $quality);
         if ($force_create_variants) {
@@ -57,17 +56,15 @@ abstract class Upload
      * @param int $quality
      * TODO: Сделать возможность передавать параметры для метода _resize()
      */
-    public static function saveImage($image, $greagwar_image, $width = null, $height = null, $quality = 87)
+    public static function saveImage($image, $greagwar_image, $width = null, $height = null, $quality = 95)
     {
-        if (!ImageVariant::getIsClass($image) && is_null($width) && is_null($height)) {
-            if (Image::getIsSubClass($image)) {
-                $width = $image::getMaxWidth();
-                $height = $image::getMaxHeight();
-            }
-        }
         $greagwar_image = clone($greagwar_image);
         if ($width || $height) {
-            $greagwar_image->resize($width, $height, 0xffffff, $force = true, $rescale = true, $crop = false);
+            if (!(ImageVariant::getIsClass($image)) && Image::getIsSubClass($image)) {
+                $greagwar_image->resize($width, $height, 0xffffff, $force = false, $rescale = false, $crop = true);
+            } else {
+                $greagwar_image->resize($width, $height, 0xffffff, $force = true, $rescale = true, $crop = false);
+            }
         }
         $image->type = $greagwar_image->guessType();
         $file_path = $greagwar_image->cacheFile($image->type, $quality, true);