diff --git a/img/loader.gif b/img/loader.gif
new file mode 100644
index 0000000..030dbe0
Binary files /dev/null and b/img/loader.gif differ
diff --git a/index.php b/index.php
index 8f20d74..6d59d10 100644
--- a/index.php
+++ b/index.php
@@ -1,9 +1,8 @@
 <Html>
 <head>
     <title></title>
-    <script src="https://code.jquery.com/jquery-2.x-git.min.js"></script>
-    <script src="http://eray.info/demo/html-to-jpeg-php/js/html2canvas.js"></script>
-
+    <script src="https://code.jquery.com/jquery-3.7.1.js"></script>
+    <script src="https://html2canvas.hertzen.com/dist/html2canvas.js"></script>
     <style>
         .se-pre-con {
             position: fixed;
@@ -15,27 +14,27 @@
             background: url("img/loader.gif") center no-repeat #fff;
         }
     </style>
-
 </head>
 <body>
-    <div class="se-pre-con"></div>
-    <?php
-        include('HtmlToJpeg.php');
+<div class="se-pre-con"></div>
+<?php
+
+include('HtmlToJpeg.php');
 
-        $html2Jpeg = new HtmlToJpeg();
+$html2Jpeg = new HtmlToJpeg();
 
-        //Example code
-            $html2Jpeg->renderView("test.html");
-            $html2Jpeg->renderView("test.html");
-            $html2Jpeg->renderView("test.html");
-            $html2Jpeg->renderHtml("<h1>Test</h1><div style='width:200px;height:300px;background:blue'></div>");
-            $html2Jpeg->renderHtml("<h1>Test</h1><div style='width:200px;height:300px;background:blue'></div>");
-            $html2Jpeg->renderView("test.html");
-            $html2Jpeg->renderHtml("<h1>Test</h1><div style='width:200px;height:300px;background:blue'></div>");
+//Example code
+$html2Jpeg->renderView("test.html");
+$html2Jpeg->renderView("test.html");
+$html2Jpeg->renderView("test.html");
+$html2Jpeg->renderHtml("<h1>Test</h1><div style='width:200px;height:300px;background:blue'></div>");
+$html2Jpeg->renderHtml("<h1>Test</h1><div style='width:200px;height:300px;background:blue'></div>");
+$html2Jpeg->renderView("test.html");
+$html2Jpeg->renderHtml("<h1>Test</h1><div style='width:200px;height:300px;background:blue'></div>");
 
+//Form creating
+echo $html2Jpeg->output();
 
-        //Form creating
-        echo $html2Jpeg->output();
-    ?>
+?>
 </body>
 </Html>
diff --git a/js/render.js b/js/render.js
index d455c4c..f3fa2f8 100644
--- a/js/render.js
+++ b/js/render.js
@@ -1,30 +1,36 @@
+var i = 0;
 
+$(document).ready(function() {
 
-$(document).ready(function(){
-    var i = 0;
-    $('.'+content_class_name).each(function() {
-        html2canvas(this,{
-            onrendered: function (canvas) {
-                //Set hidden field's value to image data (base-64 string)
-                $('#'+form_id).append('<input type="hidden" rel="'+i+'" name="'+hidden_image_names+'[]" value="'+canvas.toDataURL("image/png")+'"/>');
-                i++;
-                console.log(i);
-            }
+    $('.' + content_class_name).each(function() {
 
-        });
+        var contentItem = $(this);
+        var contentEle = contentItem.get(0);
+        var formItem = $('#' + form_id);
+
+        var canvasOnRender = function(canvas) {
+            var rendered_html = canvas.toDataURL("image/png");
+            rendered_html = String(rendered_html).trim();
+
+            // Set hidden field's value to image data (base-64 string)
+            formItem.append('<input type="hidden" rel="' + i + '" name="' + hidden_image_names + '[]" value="' + rendered_html + '"/>');
+            formItem.append('<img src="' + rendered_html + '" />');
+            // Increment i
+            i++;
+        };
+
+        var canvasOptions = {};
+        html2canvas(contentEle, canvasOptions).then(canvasOnRender);
 
     });
 
-    var timer = setInterval(function () {
-        if(i == $('.'+content_class_name).length){
+    var timer = setInterval(function() {
+        var contentClassLen = $('.' + content_class_name).length;
+        if (i == contentClassLen) {
             $('.se-pre-con').hide();
-            $('.'+content_class_name).hide();
+            $('.' + content_class_name).hide();
             clearInterval(timer);
         }
     }, 1000);
-});
-
-
-
-
 
+});
\ No newline at end of file
