diff --git a/app/components/SimpleEditor/elements/track_change/TrackChangeControlCommand.js b/app/components/SimpleEditor/elements/track_change/TrackChangeControlCommand.js
new file mode 100644
index 0000000000000000000000000000000000000000..6fe0333b576aad5ff6894b585f5248149c7875cb
--- /dev/null
+++ b/app/components/SimpleEditor/elements/track_change/TrackChangeControlCommand.js
@@ -0,0 +1,21 @@
+import {Command} from 'substance'
+
+class TrackChangeControlCommand extends Command {
+  getCommandState (params) {
+    console.log(params)
+    let newState = {
+      disabled: false,
+      active: false
+    }
+
+    return newState
+  }
+  execute () {
+    console.log('execute command enable/disable track changes')
+    return true
+  }
+}
+
+TrackChangeControlCommand.type = 'track-change-enable'
+
+export default TrackChangeControlCommand
diff --git a/app/components/SimpleEditor/elements/track_change/TrackChangeControlTool.js b/app/components/SimpleEditor/elements/track_change/TrackChangeControlTool.js
index efd24c85e069b09e94585b77886c7c118dc3efae..26ea869c4716feb59394a010b1d63804f1349708 100644
--- a/app/components/SimpleEditor/elements/track_change/TrackChangeControlTool.js
+++ b/app/components/SimpleEditor/elements/track_change/TrackChangeControlTool.js
@@ -1,6 +1,6 @@
-import { AnnotationTool } from 'substance'
+import { Tool } from 'substance'
 
-class TrackChangeControlTool extends AnnotationTool {}
+class TrackChangeControlTool extends Tool {}
 
 TrackChangeControlTool.type = 'track-change-enable'
 
diff --git a/app/components/SimpleEditor/elements/track_change/TrackChangeControlViewCommand.js b/app/components/SimpleEditor/elements/track_change/TrackChangeControlViewCommand.js
new file mode 100644
index 0000000000000000000000000000000000000000..6fc7fe24209532094c4d93b72b433f3ad94d95fd
--- /dev/null
+++ b/app/components/SimpleEditor/elements/track_change/TrackChangeControlViewCommand.js
@@ -0,0 +1,21 @@
+import {Command} from 'substance'
+
+class TrackChangeControlViewCommand extends Command {
+  getCommandState (params) {
+    console.log(params)
+    let newState = {
+      disabled: false,
+      active: false
+    }
+
+    return newState
+  }
+  execute () {
+    console.log('execute command enable/disable view mode track changes')
+    return true
+  }
+}
+
+TrackChangeControlViewCommand.type = 'track-change-toggle-view'
+
+export default TrackChangeControlViewCommand
diff --git a/app/components/SimpleEditor/elements/track_change/TrackChangeControlViewTool.js b/app/components/SimpleEditor/elements/track_change/TrackChangeControlViewTool.js
index 530b82be55b6174f5f3580f3e447380c0d199064..4f48f3fb55598df382cd85803c938971223b5ecd 100644
--- a/app/components/SimpleEditor/elements/track_change/TrackChangeControlViewTool.js
+++ b/app/components/SimpleEditor/elements/track_change/TrackChangeControlViewTool.js
@@ -1,6 +1,6 @@
-import { AnnotationTool } from 'substance'
+import { Tool } from 'substance'
 
-class TrackChangeControlViewTool extends AnnotationTool {}
+class TrackChangeControlViewTool extends Tool {}
 
 TrackChangeControlViewTool.type = 'track-change-toggle-view'
 
diff --git a/app/components/SimpleEditor/elements/track_change/TrackChangePackage.js b/app/components/SimpleEditor/elements/track_change/TrackChangePackage.js
index 7509cfbc427368dffdfb72522d9d0a95cbc5d04e..e991a612de4db88d7ba8b007db427592c362117d 100644
--- a/app/components/SimpleEditor/elements/track_change/TrackChangePackage.js
+++ b/app/components/SimpleEditor/elements/track_change/TrackChangePackage.js
@@ -3,6 +3,8 @@ import TrackChangeCommand from './TrackChangeCommand'
 import TrackChangeComponent from './TrackChangeComponent'
 import TrackChangeControlTool from './TrackChangeControlTool'
 import TrackChangeControlViewTool from './TrackChangeControlViewTool'
+import TrackChangeControlCommand from './TrackChangeControlCommand'
+import TrackChangeControlViewCommand from './TrackChangeControlViewCommand'
 // import TrackChangeHTMLConverter from './TrackChangeHTMLConverter'
 export default {
   name: 'track-change',
@@ -17,6 +19,8 @@ export default {
     config.addTool('track-change-toggle-view', TrackChangeControlViewTool, {
       target: 'track-change-toggle-view'
     })
+    config.addCommand('track-change-enable', TrackChangeControlCommand)
+    config.addCommand('track-change-toggle-view', TrackChangeControlViewCommand)
     config.addCommand(TrackChange.type, TrackChangeCommand, { nodeType: TrackChange.type })
     config.addIcon('track-change', { 'fontawesome': 'fa-eye' })