diff --git a/app/code/community/OrganicInternet/SimpleConfigurableProducts/Catalog/Block/Product/View/Type/Configurable.php b/app/code/community/OrganicInternet/SimpleConfigurableProducts/Catalog/Block/Product/View/Type/Configurable.php
index 7086d24..911761b 100644
--- a/app/code/community/OrganicInternet/SimpleConfigurableProducts/Catalog/Block/Product/View/Type/Configurable.php
+++ b/app/code/community/OrganicInternet/SimpleConfigurableProducts/Catalog/Block/Product/View/Type/Configurable.php
@@ -40,7 +40,11 @@ public function getJsonConfig()
                 if (!Mage::getStoreConfig('SCP_options/product_page/change_image_fancy')) {
                     #If image is not placeholder...
                     if($product->getImage()!=='no_selection') {
-                        $childProducts[$productId]["imageUrl"] = (string)Mage::helper('catalog/image')->init($product, 'image');
+                        $productMag = Mage::getModel('catalog/product')->load($productId);
+                        foreach($productMag->getMediaGalleryImages() as $image)
+                        {
+                            $childProducts[$productId]["imageUrl"][] = (string)Mage::helper('catalog/image')->init($product, 'image', $image->getFile());
+                        }
                     }
                 }
             }
@@ -75,7 +79,10 @@ public function getJsonConfig()
         $config['shortDescription'] = $this->helper('catalog/output')->productAttribute($p, nl2br($p->getShortDescription()), 'short_description');
 
         if (Mage::getStoreConfig('SCP_options/product_page/change_image')) {
-            $config["imageUrl"] = (string)Mage::helper('catalog/image')->init($p, 'image');
+            foreach($p->getMediaGalleryImages() as $image)
+            {
+                $config["imageUrl"][] = (string)Mage::helper('catalog/image')->init($p, 'image', $image->getFile());
+            }
         }
 
         $childBlock = $this->getLayout()->createBlock('catalog/product_view_attributes');
diff --git a/skin/frontend/base/default/js/scp_product_extension.js b/skin/frontend/base/default/js/scp_product_extension.js
index 7e72154..42b3997 100644
--- a/skin/frontend/base/default/js/scp_product_extension.js
+++ b/skin/frontend/base/default/js/scp_product_extension.js
@@ -211,16 +211,14 @@ Product.Config.prototype.updateProductImage = function(productId) {
         return;
     }
 
-    if($('image')) {
-        $('image').src = imageUrl;
-    } else {
-        $$('#product_addtocart_form p.product-image img').each(function(el) {
-            var dims = el.getDimensions();
-            el.src = imageUrl;
-            el.width = dims.width;
-            el.height = dims.height;
-        });
+    // Galleria update
+    var gal = Galleria.get(0);
+    var dataArr = new Array();
+    for(var i=0;i<imageUrl.length;i++)
+    {
+        dataArr.push({image: imageUrl[i]});
     }
+    gal.load(dataArr);
 };
 
 Product.Config.prototype.updateProductName = function(productId) {