diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js
index da54a8c..f41e7f1 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js
@@ -198,7 +198,6 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
         $("#openCBJsonFile").trigger("click");
         var fileupload = document.getElementById("openCBJsonFile");        
         
-
         fileupload.onchange = function () {
 
             var fileId, file, objFileRead;
@@ -2374,10 +2373,10 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
     $scope.updateWindowsContentForSaveCB = function (currentId) { 
         
         $scope.saveDAWindowActivity(currentId);
-        //$scope.saveAAWindowActivity(currentId);
-        //$scope.saveCIWindowActivity(currentId);
-        //$scope.saveCAWindowActivity(currentId);
-        //$scope.save3DWindowActivity(currentId);            
+        $scope.saveAAWindowActivity(currentId);
+        $scope.saveCIWindowActivity(currentId);
+        $scope.saveCAWindowActivity(currentId);
+        $scope.save3DWindowActivity(currentId);            
 
         //$scope.savePicWindowActivity($scope.windowDataforCB);
         //if ($scope.updatedWindowListForSaveCB.length > 0) {
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
index 928bb02..a4d6e78 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
@@ -3658,7 +3658,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
                                     // {
                                     //     var updatedWhiteImageDataList=$scope.GetwindowStoreData(windowviewid,'updatedWhiteImageDataList');         
                                     //      updatedWhiteImageDataList[bodyRegionId - 1] = updatedData;
-                                    // }
+                                    // }                                    
                                        
                                 }
                                 else {
@@ -3691,7 +3691,18 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
                                         }
                                     }
                                 }
-                          
+                                //Set Canvas Position which saved from CB module 
+                                //var isExtract = $scope.GetwindowStoreData(windowviewid, 'isExtract')
+                                if ($rootScope.isCallFromOtherModule) {
+                                    var canvasHScrollX = $scope.daOpenInOtherModules.canvasHScrollX;
+                                    var canvasVScrollX = $scope.daOpenInOtherModules.canvasVScrollX;
+                                    $('#canvasDivDA_' + windowviewid).scrollLeft(canvasHScrollX);
+                                    $('#canvasDivDA_' + windowviewid).scrollTop(canvasVScrollX);
+
+                                    $scope.SetwindowStoreData(windowviewid, 'CanvasDivTopPosition', $("#canvasDivDA_" + windowviewid).scrollTop());
+                                    $scope.SetwindowStoreData(windowviewid, 'CanvasDivLeftPosition', $("#canvasDivDA_" + windowviewid).scrollLeft());
+                                }
+                                                          
                             };
                             worker.onerror = function (e) {
                                 alert('Error: Line ' + e.lineno + ' in ' + e.filename + ': ' + e.message);
@@ -8393,6 +8404,11 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
             $scope.DisableUI();
 
             console.log('isCalledFromButton= ' + isCalledFromButton);
+
+            var CanvasDivLeftPosition = $scope.GetwindowStoreData(windowviewid, 'CanvasDivLeftPosition');
+            var CanvasDivTopPosition = $scope.GetwindowStoreData(windowviewid, 'CanvasDivTopPosition');
+            $('#canvasDivDA_' + windowviewid).scrollTop(CanvasDivTopPosition);
+            $('#canvasDivDA_' + windowviewid).scrollLeft(CanvasDivLeftPosition);
           
             $scope.SetwindowStoreData(windowviewid,'CanvasDivLeftPosition',$('#canvasDivDA_' + windowviewid).scrollLeft());
             $scope.SetwindowStoreData(windowviewid,'CanvasDivTopPosition',$('#canvasDivDA_' + windowviewid).scrollTop());