diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js
index 15f0753..7ea7d4e 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js
@@ -619,7 +619,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
         $("#canvasPaint").css("display", "block");
    
         $rootScope.BindCanvasDrawingListners();
-    //   $rootScope.FreeStylePaint();
+     $rootScope.FreeStylePaint();
     });
 
     $scope.ReloadListViewImageDiv = function (id) {
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
index f81d04d..a2339a2 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
@@ -6857,114 +6857,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
 
 
 
-    $rootScope.FreeStylePaint = function (e) {
-
-        var annotationCanvas = document.getElementById("canvas");
-        //  document.getElementById("canvasPaint").addEventListener("mouseup", OnPaintBrushCanvasMouseUp);
-
-        annotationCanvas.addEventListener('mousedown', $scope.OnPaintCanvasMouseDown, false);
-
-        annotationCanvas.addEventListener('mouseup', $scope.OnPaintBrushCanvasMouseUp, false);
-    }
-    $scope.OnPaintCanvasMouseDown = function (event) {
-        $rootScope.isMousedownOnPaintCanvas = true;
-        $scope.isStartPointDeleted = false;
-        var annotationCanvas = document.getElementById("canvas");
-        $scope.startPageX = parseInt(event.clientX - ($("#canvas").offset().left));
-        $scope.startPageY = parseInt(event.clientY - ($("#canvas").offset().top));
-
-        annotationCanvas.addEventListener('mousemove', $scope.OnPaintCanvasMouseMove, false);
-
-
-
-    }
-    $scope.OnPaintCanvasMouseMove = function (event) {
-
-
-        $rootScope.xPage = parseInt(event.clientX - ($("#canvas").offset().left));
-        $rootScope.yPage = parseInt(event.clientY - ($("#canvas").offset().top));
-
-        var btneraseBrushSizeValue = $("#btnBrushSize").val();
-        $rootScope.eraseshapeSize = parseInt(btneraseBrushSizeValue);
-
-        if ($rootScope.isEraseToolSelected == true && $rootScope.isMousedownOnPaintCanvas == true) {
-
-            var sktch = $('#canvasPaint').sketch();
-            $('#canvasPaint').sketch().actions = [];
-            var paintCanvas = document.getElementById("canvasPaint");
-            var paintCanvasContext = paintCanvas.getContext('2d');
-            if ($scope.isStartPointDeleted == false) {
-
-                paintCanvasContext.clearRect($scope.startPageX, $scope.startPageY, $rootScope.eraseshapeSize, $rootScope.eraseshapeSize);
-
-                $scope.isStartPointDeleted = true;
-            }
-
-            paintCanvasContext.clearRect($rootScope.xPage, $rootScope.yPage, $rootScope.eraseshapeSize, $rootScope.eraseshapeSize);
-
-
-        }
-    }
-    $scope.OnPaintBrushCanvasMouseDown = function (event) {
-        switch ($rootScope.shapeType) {
-
-            case "FreeStylePaint":
-
-
-
-                //  $('#canvasPaint').sketch();
-                //   $('#canvasPaint').sketch({ defaultSize: 1 });
-                //  if ($("#amount-2").val() == '') {
-                //      //$('#canvasPaint').sketch({ defaultSize: $scope.shapesize });
-                //      $('#canvasPaint').sketch();
-                //  }
-                //  else {
-
-                //  //    var a = $("#amount-2").val();
-                ////      $scope.shapesize = parseInt(a);
-                //   //   $('#canvasPaint').sketch({ defaultSize: $rootScope.shapeSize });
-                // //     $('#canvasPaint').sketch({ defaultSize: $scope.shapesize });
-
-                //  }
-
-
-                break;
-
-        }
-    }
-    $scope.OnPaintBrushCanvasMouseUp = function (event) {
-        $rootScope.isMousedownOnPaintCanvas = false;
-        $rootScope.isEraseToolSelected = false;
-
-        //   var canvasElement1 = document.getElementById("canvasPaint");
-        //   var ctx1 = canvasElement1.getContext("2d");
-
-        //switch($rootScope.shapeType)
-        //{
-
-        //    case "FreeStylePaint":
-
-
-        //        if ($("#amount-2").val() == '')
-        //        {
-        //            $('#canvasPaint').sketch({ defaultSize: $scope.shapesize });
-        //        }
-        //        else 
-        //        {
-
-        //            var a = $("#amount-2").val();
-        //            $scope.shapesize = parseInt(a);
-        //            alert(JSON.stringify({ defaultSize: $scope.shapesize }));
-        //            $('#canvasPaint').sketch({ defaultSize: $scope.shapesize });
-
-        //        }
-
-
-        //        break;
-
-        //}
-
-    }
+   
+    
 
 
 
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
index 4016108..e99b0f4 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
@@ -2102,6 +2102,65 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", 
 
         };
 
+
+
+        $rootScope.FreeStylePaint = function (e) {
+            
+            var annotationCanvas = document.getElementById("canvas");
+            //  document.getElementById("canvasPaint").addEventListener("mouseup", OnPaintBrushCanvasMouseUp);
+
+            annotationCanvas.addEventListener('mousedown', $rootScope.OnPaintBrushCanvasMouseDown, false);
+
+            annotationCanvas.addEventListener('mouseup', $rootScope.OnPaintBrushCanvasMouseUp, false);
+        }
+
+
+
+
+        $rootScope.OnPaintBrushCanvasMouseDown = function (event) {
+            $rootScope.isMousedownOnPaintCanvas = true;
+            $rootScope.isStartPointDeleted = false;
+            var annotationCanvas = document.getElementById("canvas");
+            $rootScope.startPageX = parseInt(event.clientX - ($("#canvas").offset().left));
+            $rootScope.startPageY = parseInt(event.clientY - ($("#canvas").offset().top));
+
+            annotationCanvas.addEventListener('mousemove', $rootScope.OnPaintCanvasMouseMove, false);
+
+        }
+        $rootScope.OnPaintCanvasMouseMove = function (event) {
+
+            $rootScope.xPage = parseInt(event.clientX - ($("#canvas").offset().left));
+            $rootScope.yPage = parseInt(event.clientY - ($("#canvas").offset().top));
+
+            var btneraseBrushSizeValue = $("#btnBrushSize").val();
+            $rootScope.eraseshapeSize = parseInt(btneraseBrushSizeValue);
+
+            if ($rootScope.isEraseToolSelected == true && $rootScope.isMousedownOnPaintCanvas == true) {
+
+                var sktch = $('#canvasPaint').sketch();
+                $('#canvasPaint').sketch().actions = [];
+                var paintCanvas = document.getElementById("canvasPaint");
+                var paintCanvasContext = paintCanvas.getContext('2d');
+                if ($rootScope.isStartPointDeleted == false) {
+
+                    paintCanvasContext.clearRect($rootScope.startPageX, $rootScope.startPageY, $rootScope.eraseshapeSize, $rootScope.eraseshapeSize);
+
+                    $rootScope.isStartPointDeleted = true;
+                }
+
+                paintCanvasContext.clearRect($rootScope.xPage, $rootScope.yPage, $rootScope.eraseshapeSize, $rootScope.eraseshapeSize);
+
+
+            }
+        }
+        $rootScope.OnPaintBrushCanvasMouseUp = function (event) {
+            $rootScope.isMousedownOnPaintCanvas = false;
+            $rootScope.isEraseToolSelected = false;
+
+
+        }
+
+
         $rootScope.reloadChildController = function () {
 
             var len = $rootScope.openModules.length;