diff --git a/editors/demo/src/Editoria/config/config.js b/editors/demo/src/Editoria/config/config.js
index c997a2869c5a74dd0b9c16c57664e2eaf2db17ec..7fa44359dc42d458e7018f346090d316a7945171 100644
--- a/editors/demo/src/Editoria/config/config.js
+++ b/editors/demo/src/Editoria/config/config.js
@@ -72,9 +72,9 @@ const updateTitle = debounce(title => {
   // console.log(title);
 }, 100);
 
-const getComments = debounce(comments => {
+const getComments = comments => {
   console.log(comments);
-}, 2000);
+};
 
 const setComments = (
   comments = [
diff --git a/editors/demo/src/Editors.js b/editors/demo/src/Editors.js
index 9227cb24d058f05235db4ac16201367105dbd3d8..02c1e2bd0d8523adee16c870bfcf727ade1e0919 100644
--- a/editors/demo/src/Editors.js
+++ b/editors/demo/src/Editors.js
@@ -91,7 +91,7 @@ const Editors = () => {
       case 'oen':
         return <OEN />;
       default:
-        return <HHMI />;
+        return <Editoria />;
     }
   };
 
diff --git a/wax-prosemirror-services/src/CommentsService/CommentsService.js b/wax-prosemirror-services/src/CommentsService/CommentsService.js
index 0a6074ae3a0047ac900bd1fa902d6e94236034b4..ffdcbd3985fe65c55751bd15caecdf410c0a49e5 100644
--- a/wax-prosemirror-services/src/CommentsService/CommentsService.js
+++ b/wax-prosemirror-services/src/CommentsService/CommentsService.js
@@ -62,7 +62,7 @@ export default class CommentsService extends Service {
 
     this.app.PmPlugins.add(
       'commentPlugin',
-      CommentPlugin('commentPlugin', this.app.context),
+      CommentPlugin('commentPlugin', this.app),
     );
 
     const createOverlay = this.container.get('CreateOverlay');
diff --git a/wax-prosemirror-services/src/CommentsService/plugins/CommentPlugin.js b/wax-prosemirror-services/src/CommentsService/plugins/CommentPlugin.js
index c91b6f57651e3ce3bed40e884df8a5bb91f04ceb..c821a2ea488fc66454a75db828edd03921a11428 100644
--- a/wax-prosemirror-services/src/CommentsService/plugins/CommentPlugin.js
+++ b/wax-prosemirror-services/src/CommentsService/plugins/CommentPlugin.js
@@ -6,7 +6,9 @@ import { CommentDecorationPluginKey } from './CommentDecorationPlugin';
 
 const commentPlugin = new PluginKey('commentPlugin');
 
-const getComment = (state, context) => {
+const getComment = (state, app) => {
+  if (!app.config.get('config.YjsService')) return getCommentNonYjs(state, app);
+  const { context } = app;
   const commentsMap = CommentDecorationPluginKey.getState(state).getMap();
   const commentsDataMap = CommentDecorationPluginKey.getState(
     state,
@@ -42,15 +44,19 @@ const getComment = (state, context) => {
   return undefined;
 };
 
-export default (key, context) => {
+const getCommentNonYjs = (state, app) => {
+  console.log('non yjs active');
+};
+
+export default (key, app) => {
   return new Plugin({
     key: commentPlugin,
     state: {
       init: (_, state) => {
-        return { comment: getComment(state, context) };
+        return { comment: getComment(state, app) };
       },
       apply(tr, prev, _, newState) {
-        const comment = getComment(newState, context);
+        const comment = getComment(newState, app);
         let createDecoration;
         if (comment) {
           createDecoration = DecorationSet.create(newState.doc, [
diff --git a/wax-prosemirror-services/src/CommentsService/plugins/CommentState.js b/wax-prosemirror-services/src/CommentsService/plugins/CommentState.js
index 90f4c7e0383d158ad5a376a1c66e224992fc57a7..de25581f5efd93c9dfafb975c4c42def20af4af5 100644
--- a/wax-prosemirror-services/src/CommentsService/plugins/CommentState.js
+++ b/wax-prosemirror-services/src/CommentsService/plugins/CommentState.js
@@ -1,3 +1,4 @@
+/* eslint-disable consistent-return */
 /* eslint-disable no-param-reassign */
 import { v4 as uuidv4 } from 'uuid';
 import { Decoration, DecorationSet } from 'prosemirror-view';
@@ -20,7 +21,25 @@ export default class CommentState {
     this.transactYjsPos = false;
   }
 
+  addCommentNonYjs(action) {
+    const id = randomId();
+    const { map } = this.options;
+    const { from, to, data } = action;
+    map.set(id, {
+      id,
+      from,
+      to,
+      data,
+    });
+  }
+
   addComment(action, ystate) {
+    // NON YJS ADD
+    if (!ystate?.binding && !ystate?.binding.mapping) {
+      return this.addCommentNonYjs(action);
+    }
+
+    //  YJS ADD COMMENT
     this.transactYjsPos = true;
     const { map, commentsDataMap } = this.options;
     const { from, to, data } = action;
@@ -35,9 +54,18 @@ export default class CommentState {
       ystate.type,
       ystate.binding.mapping,
     );
-    map.set(id, { id, from: relativeFrom, to: relativeTo, data });
-    if (ystate?.binding && ystate?.binding.mapping)
-      commentsDataMap.set(id, { id, from: relativeFrom, to: relativeTo, data });
+    map.set(id, {
+      id,
+      from: relativeFrom,
+      to: relativeTo,
+      data,
+    });
+    commentsDataMap.set(id, {
+      id,
+      from: relativeFrom,
+      to: relativeTo,
+      data,
+    });
     setTimeout(() => {
       this.transactYjsPos = false;
     });
diff --git a/wax-prosemirror-services/src/WaxToolGroups/BlockDropDownToolGroupService/BlockDropDownComponent.js b/wax-prosemirror-services/src/WaxToolGroups/BlockDropDownToolGroupService/BlockDropDownComponent.js
index 286f7e862a3527157f1c72243f815d0ca1c8ff62..9f382ab1e3f49024e078dbf8cf6a696fa0820b71 100644
--- a/wax-prosemirror-services/src/WaxToolGroups/BlockDropDownToolGroupService/BlockDropDownComponent.js
+++ b/wax-prosemirror-services/src/WaxToolGroups/BlockDropDownToolGroupService/BlockDropDownComponent.js
@@ -164,7 +164,6 @@ const BlockDropDownComponent = ({ view, tools }) => {
   }, [isDisabled]);
 
   useEffect(() => {
-    console.log('here?');
     setLabel(translatedLabel('Wax.BlockLevel.Block Level', 'Styles'));
     let delayedSetLabel = () => true;
     dropDownOptions.forEach(option => {