diff --git a/LesionTracker/.meteor/versions b/LesionTracker/.meteor/versions
index 656baa7d9..12d2532d3 100644
--- a/LesionTracker/.meteor/versions
+++ b/LesionTracker/.meteor/versions
@@ -43,7 +43,6 @@ ddp-common@1.2.8
 ddp-rate-limiter@1.0.6
 ddp-server@1.3.12
 deps@1.0.12
-design@0.0.1
 diff-sequence@1.0.7
 ecmascript@0.6.1
 ecmascript-runtime@0.3.15
@@ -65,6 +64,10 @@ iron:controller@1.0.12
 iron:core@1.0.11
 iron:dynamic-template@1.0.12
 iron:layout@1.0.12
+iron:location@1.0.11
+iron:middleware-stack@1.1.0
+iron:router@1.0.13
+iron:url@1.0.11
 johdirr:meteor-git-rev@0.0.4
 jquery@1.11.10
 launch-screen@1.1.0
@@ -92,6 +95,7 @@ npm-mongo@2.2.11_2
 observe-sequence@1.0.14
 ohif:core@0.0.1
 ohif:cornerstone@0.0.1
+ohif:design@0.0.1
 ohif:dicom-services@0.0.1
 ohif:hanging-protocols@0.0.1
 ohif:lesiontracker@0.0.1
diff --git a/LesionTracker/client/routes.js b/LesionTracker/client/routes.js
index 33793c84e..9c8bd2afe 100644
--- a/LesionTracker/client/routes.js
+++ b/LesionTracker/client/routes.js
@@ -1,3 +1,6 @@
+import { Session } from 'meteor/session';
+import { Router } from 'meteor/iron:router';
+
 Session.setDefault('ViewerData', {});
 
 // verifyEmail controls whether emailVerification template will be rendered or not
diff --git a/OHIFViewer/.meteor/packages b/OHIFViewer/.meteor/packages
index dd79c88e3..c32dee8ff 100644
--- a/OHIFViewer/.meteor/packages
+++ b/OHIFViewer/.meteor/packages
@@ -39,7 +39,6 @@ reactive-var@1.0.11
 
 practicalmeteor:loglevel
 reactive-dict@1.1.8
-clinical:router
 fastclick@1.0.13
 standard-minifier-css@1.3.2
 standard-minifier-js@1.2.1
diff --git a/OHIFViewer/.meteor/versions b/OHIFViewer/.meteor/versions
index fbb6a1e54..0830faba9 100644
--- a/OHIFViewer/.meteor/versions
+++ b/OHIFViewer/.meteor/versions
@@ -20,10 +20,10 @@ caching-compiler@1.1.9
 caching-html-compiler@1.0.7
 callback-hook@1.0.10
 check@1.2.4
-clinical:router@2.0.19
-clinical:router-location@2.1.0
-clinical:router-middleware-stack@2.1.2
-clinical:router-url@2.1.0
+clinical:router@2.0.17
+clinical:router-location@2.0.14
+clinical:router-middleware-stack@2.0.13
+clinical:router-url@2.0.15
 coffeescript@1.11.1_4
 ddp@1.2.5
 ddp-client@1.3.2
diff --git a/OHIFViewer/client/components/viewer/viewer.js b/OHIFViewer/client/components/viewer/viewer.js
index bc7f32533..cf26126a5 100644
--- a/OHIFViewer/client/components/viewer/viewer.js
+++ b/OHIFViewer/client/components/viewer/viewer.js
@@ -9,11 +9,11 @@ OHIF.viewer.cine = {
 };
 
 OHIF.viewer.functionList = {
-    toggleCineDialog: toggleCineDialog,
-    toggleCinePlay: toggleCinePlay,
-    clearTools: clearTools,
-    resetViewport: resetViewport,
-    invert: invert
+    toggleCineDialog: OHIF.viewerbase.viewportUtils.toggleCineDialog,
+    toggleCinePlay: OHIF.viewerbase.viewportUtils.toggleCinePlay,
+    clearTools: OHIF.viewerbase.viewportUtils.clearTools,
+    resetViewport: OHIF.viewerbase.viewportUtils.resetViewport,
+    invert: OHIF.viewerbase.viewportUtils.invert
 };
 
 Session.setDefault('activeViewport', false);
diff --git a/OHIFViewer/client/routes.js b/OHIFViewer/client/routes.js
index 93a6c9824..6ef416552 100644
--- a/OHIFViewer/client/routes.js
+++ b/OHIFViewer/client/routes.js
@@ -1,3 +1,6 @@
+import { Session } from 'meteor/session';
+import { Router } from 'meteor/iron:router';
+
 Session.setDefault('ViewerData', {});
 
 Router.configure({
diff --git a/Packages/ohif-wadoproxy/package.js b/Packages/ohif-wadoproxy/package.js
index b74f83d12..df4f6b1cf 100755
--- a/Packages/ohif-wadoproxy/package.js
+++ b/Packages/ohif-wadoproxy/package.js
@@ -9,7 +9,7 @@ Package.onUse(function(api) {
 
     api.use('ecmascript');
     api.use('standard-app-packages');
-    api.use('clinical:router');
+    api.use('iron:router@1.0.13');
 
     api.addFiles('server/namespace.js');