diff --git a/anatomy/static/js/anatomy.js b/anatomy/static/js/anatomy.js
index 8bd1d64d..af730a26 100644
--- a/anatomy/static/js/anatomy.js
+++ b/anatomy/static/js/anatomy.js
@@ -293,16 +293,16 @@ function setUpDicom(element) {
   cornerstone.loadAndCacheImage(imageIds[0]).then(function (image) {
     cornerstone.displayImage(element, image);
 
-    cornerstoneTools.addTool(PanTool);
-    cornerstoneTools.addTool(ZoomTool);
-    cornerstoneTools.addTool(ZoomMouseWheelTool);
-    cornerstoneTools.addTool(WwwcTool);
-    cornerstoneTools.addTool(WwwcRegionTool);
-    cornerstoneTools.addTool(RotateTool);
-    cornerstoneTools.addTool(StackScrollTool);
-    cornerstoneTools.addTool(MagnifyTool);
-
-    cornerstoneTools.addTool(ArrowAnnotateTool, {
+    cornerstoneTools.addToolForElement(element, PanTool);
+    cornerstoneTools.addToolForElement(element, ZoomTool);
+    cornerstoneTools.addToolForElement(element, ZoomMouseWheelTool);
+    cornerstoneTools.addToolForElement(element, WwwcTool);
+    cornerstoneTools.addToolForElement(element, WwwcRegionTool);
+    cornerstoneTools.addToolForElement(element, RotateTool);
+    cornerstoneTools.addToolForElement(element, StackScrollTool);
+    cornerstoneTools.addToolForElement(element, MagnifyTool);
+                                       
+    cornerstoneTools.addToolForElement(element, ArrowAnnotateTool, {
       configuration: {
         getTextCallback: () => { },
         changeTextCallback: () => { },
@@ -317,15 +317,15 @@ function setUpDicom(element) {
 
     // Enable our tools
     // Avoid incorrect aspect ratio
-    cornerstoneTools.setToolActive("Pan", { mouseButtonMask: 1 });
-    cornerstoneTools.setToolActive("Wwwc", { mouseButtonMask: 2 });
-    cornerstoneTools.setToolActive("ZoomMouseWheel", { mouseButtonMask: 3 });
-    cornerstoneTools.setToolActive("Zoom", { mouseButtonMask: 4 });
+    cornerstoneTools.setToolActiveForElement(element, "Pan", { mouseButtonMask: 1 });
+    cornerstoneTools.setToolActiveForElement(element, "Wwwc", { mouseButtonMask: 2 });
+    cornerstoneTools.setToolActiveForElement(element, "ZoomMouseWheel", { mouseButtonMask: 3 });
+    cornerstoneTools.setToolActiveForElement(element, "Zoom", { mouseButtonMask: 4 });
 
     if (element.dataset.edit_annotation == "true") {
-      cornerstoneTools.setToolActive("ArrowAnnotate", { mouseButtonMask: 2 });
+      cornerstoneTools.setToolActiveForElement(element, "ArrowAnnotate", { mouseButtonMask: 2 });
     } else {
-      cornerstoneTools.setToolEnabled("ArrowAnnotate");
+      cornerstoneTools.setToolEnabledForElement(element, "ArrowAnnotate");
     }
 
     if (element.dataset.annotations) {
diff --git a/static/js/anatomy.js b/static/js/anatomy.js
index 8bd1d64d..af730a26 100644
--- a/static/js/anatomy.js
+++ b/static/js/anatomy.js
@@ -293,16 +293,16 @@ function setUpDicom(element) {
   cornerstone.loadAndCacheImage(imageIds[0]).then(function (image) {
     cornerstone.displayImage(element, image);
 
-    cornerstoneTools.addTool(PanTool);
-    cornerstoneTools.addTool(ZoomTool);
-    cornerstoneTools.addTool(ZoomMouseWheelTool);
-    cornerstoneTools.addTool(WwwcTool);
-    cornerstoneTools.addTool(WwwcRegionTool);
-    cornerstoneTools.addTool(RotateTool);
-    cornerstoneTools.addTool(StackScrollTool);
-    cornerstoneTools.addTool(MagnifyTool);
-
-    cornerstoneTools.addTool(ArrowAnnotateTool, {
+    cornerstoneTools.addToolForElement(element, PanTool);
+    cornerstoneTools.addToolForElement(element, ZoomTool);
+    cornerstoneTools.addToolForElement(element, ZoomMouseWheelTool);
+    cornerstoneTools.addToolForElement(element, WwwcTool);
+    cornerstoneTools.addToolForElement(element, WwwcRegionTool);
+    cornerstoneTools.addToolForElement(element, RotateTool);
+    cornerstoneTools.addToolForElement(element, StackScrollTool);
+    cornerstoneTools.addToolForElement(element, MagnifyTool);
+                                       
+    cornerstoneTools.addToolForElement(element, ArrowAnnotateTool, {
       configuration: {
         getTextCallback: () => { },
         changeTextCallback: () => { },
@@ -317,15 +317,15 @@ function setUpDicom(element) {
 
     // Enable our tools
     // Avoid incorrect aspect ratio
-    cornerstoneTools.setToolActive("Pan", { mouseButtonMask: 1 });
-    cornerstoneTools.setToolActive("Wwwc", { mouseButtonMask: 2 });
-    cornerstoneTools.setToolActive("ZoomMouseWheel", { mouseButtonMask: 3 });
-    cornerstoneTools.setToolActive("Zoom", { mouseButtonMask: 4 });
+    cornerstoneTools.setToolActiveForElement(element, "Pan", { mouseButtonMask: 1 });
+    cornerstoneTools.setToolActiveForElement(element, "Wwwc", { mouseButtonMask: 2 });
+    cornerstoneTools.setToolActiveForElement(element, "ZoomMouseWheel", { mouseButtonMask: 3 });
+    cornerstoneTools.setToolActiveForElement(element, "Zoom", { mouseButtonMask: 4 });
 
     if (element.dataset.edit_annotation == "true") {
-      cornerstoneTools.setToolActive("ArrowAnnotate", { mouseButtonMask: 2 });
+      cornerstoneTools.setToolActiveForElement(element, "ArrowAnnotate", { mouseButtonMask: 2 });
     } else {
-      cornerstoneTools.setToolEnabled("ArrowAnnotate");
+      cornerstoneTools.setToolEnabledForElement(element, "ArrowAnnotate");
     }
 
     if (element.dataset.annotations) {