diff --git a/modules/ROOT/examples/live-demos/comments-callback-with-mentions/index.html b/modules/ROOT/examples/live-demos/comments-callback-with-mentions/index.html
index fb90bbd07a..5e0878b4c0 100644
--- a/modules/ROOT/examples/live-demos/comments-callback-with-mentions/index.html
+++ b/modules/ROOT/examples/live-demos/comments-callback-with-mentions/index.html
@@ -1,4 +1,4 @@
-<textarea id="comments-callback">
+<textarea id="comments-callback-with-mentions">
 <h2>Welcome to Tiny Comments!</h2>
 <p>Please try out this demo of our Tiny Comments premium plugin with @mentions support.</p>
 <ol>
diff --git a/modules/ROOT/examples/live-demos/comments-callback-with-mentions/index.js b/modules/ROOT/examples/live-demos/comments-callback-with-mentions/index.js
index d59ba9e27c..bb74433204 100644
--- a/modules/ROOT/examples/live-demos/comments-callback-with-mentions/index.js
+++ b/modules/ROOT/examples/live-demos/comments-callback-with-mentions/index.js
@@ -1,18 +1,46 @@
 import ('https://cdn.jsdelivr.net/npm/@faker-js/faker@9/dist/index.min.js').then(({ faker }) => {
-  const adminUser = {
-    id: 'johnsmith',
-    name: 'John Smith',
-    fullName: 'John Smith',
-    description: 'Company Founder',
-    image: "https://i.pravatar.cc/150?img=11"
+  const userDb = {
+    'michaelcook': {
+      id: 'michaelcook',
+      name: 'Michael Cook',
+      fullName: 'Michael Cook',
+      description: 'Product Owner',
+      image: "{{imagesdir}}/avatars/michaelcook.png"
+    },
+    'kalebwilson': {
+      id: 'kalebwilson',
+      name: 'Kaleb Wilson',
+      fullName: 'Kaleb Wilson',
+      description: 'Marketing Director',
+      image: "{{imagesdir}}/avatars/kalebwilson.png"
+    }
   };
-
-  const currentUser = {
-    id: 'jennynichols',
-    name: 'Jenny Nichols',
-    fullName: 'Jenny Nichols',
-    description: 'Marketing Director',
-    image: "https://i.pravatar.cc/150?img=10"
+  
+  const currentUid = 'kalebwilson';
+  const adminUid = 'michaelcook';
+  
+  const currentUser = userDb[currentUid];
+  const adminUser = userDb[adminUid];
+  
+  const now = new Date();
+  const yesterday = new Date(now.getTime() - 24 * 60 * 60 * 1000).toISOString();
+  const anhourago = new Date(now.getTime() - 60 * 60 * 1000).toISOString();
+  
+  const fillAuthorInfo = (id, fullName, image) => ({
+    author: id,
+    authorName: fullName,
+    authorAvatar: image,
+  });
+  
+  const getAuthorInfo = (uid) => {
+    const user = userDb[uid];
+    if (user) {
+      return fillAuthorInfo(user.id, user.fullName, user.image);
+    }
+    return {
+      author: uid,
+      authorName: uid,
+    };
   };
   
   const conversationDb = {
@@ -20,33 +48,26 @@ import ('https://cdn.jsdelivr.net/npm/@faker-js/faker@9/dist/index.min.js').then
       uid: 'mce-conversation_19679600221621399703915',
       comments: [{
         uid: 'mce-conversation_19679600221621399703915',
-        author: currentUser.id,
-        authorName: currentUser.fullName,
-        authorAvatar: currentUser.image,
-        content: `What do you think about this @${adminUser.id}?`,
-        createdAt: '2021-05-19T04:48:23.914Z',
-        modifiedAt: '2021-05-19T04:48:23.914Z'
-      },
-      {
+        ...getAuthorInfo(currentUid),
+        content: `What do you think about this? @${adminUser.id}?`,
+        createdAt: yesterday,
+        modifiedAt: yesterday
+      }, {
         uid: 'mce-conversation_19679600221621399703917',
-        author: adminUser.id,
-        authorName: adminUser.fullName,
-        authorAvatar: adminUser.image,
+        ...getAuthorInfo(adminUid),
         content: `I think this is a great idea @${currentUser.id}!`,
-        createdAt: "2024-05-28T12:54:24.126Z",
-        modifiedAt: "2024-05-28T12:54:24.126Z",
+        createdAt: anhourago,
+        modifiedAt: anhourago,
       }]
     },
     'mce-conversation_420304606321716900864126': {
       uid: 'mce-conversation_420304606321716900864126',
       comments: [{
         uid: 'mce-conversation_420304606321716900864126',
-        author: adminUser.id,
-        authorName: adminUser.fullName,
-        authorAvatar: adminUser.image,
+        ...getAuthorInfo(adminUid),
         content: `@${currentUser.id} Please revise this sentence, exclamation points are unprofessional!`,
-        createdAt: '2024-05-28T12:54:24.126Z',
-        modifiedAt: '2024-05-28T12:54:24.126Z'
+        createdAt: yesterday,
+        modifiedAt: anhourago
       }]
     }
   };
@@ -122,6 +143,10 @@ import ('https://cdn.jsdelivr.net/npm/@faker-js/faker@9/dist/index.min.js').then
 
   const fakeServer = setupFakeServer();
   
+  /********************************
+   *   Mentions functions    *
+   ********************************/
+  
   const mentions_fetch = (query, success) => {
     if (!fetchedUsers) {
       fetchedUsers = true;
@@ -162,6 +187,11 @@ import ('https://cdn.jsdelivr.net/npm/@faker-js/faker@9/dist/index.min.js').then
     }
   };
   
+  /********************************
+   *   Tiny Comments functions    *
+   * (must call "done" or "fail") *
+   ********************************/
+
   const tinycomments_create = (req, done, fail) => {
     if (req.content === 'fail') {
       fail(new Error('Something has gone wrong...'));
@@ -170,131 +200,132 @@ import ('https://cdn.jsdelivr.net/npm/@faker-js/faker@9/dist/index.min.js').then
       conversationDb[uid] = {
         uid,
         comments: [{
-        uid,
-        authorName: currentUser.fullName,
-        authorAvatar: currentUser.image,
-        author: currentUser.name,
-        content: req.content,
-        createdAt: req.createdAt,
-        modifiedAt: req.createdAt
+          uid,
+          ...getAuthorInfo(currentUid),
+          content: req.content,
+          createdAt: req.createdAt,
+          modifiedAt: req.createdAt
         }]
       };
-    
-      setTimeout(() => {
-        done({
-        conversationUid: uid
-        });
-      }, fakeDelay);
+      setTimeout(() => done({ conversationUid: uid }), fakeDelay);
     }
   };
-  
+
   const tinycomments_reply = (req, done) => {
     const replyUid = 'annotation-' + randomString();
-    const current = conversationDb[req.conversationUid];
-    current.comments.push(
-      {
-        uid: replyUid,
-        authorName: currentUser.fullName,
-        authorAvatar: currentUser.image,
-        author: currentUser.name,
-        content: req.content,
-        createdAt: req.createdAt,
-        modifiedAt: req.createdAt
-      }
-    );
-  
-    setTimeout(() => {
-      done({
-        commentUid: replyUid
-      });
-    }, fakeDelay);
+    conversationDb[req.conversationUid].comments.push({
+      uid: replyUid,
+      ...getAuthorInfo(currentUid),
+      content: req.content,
+      createdAt: req.createdAt,
+      modifiedAt: req.createdAt
+    });
+    setTimeout(() => done({ commentUid: replyUid }), fakeDelay);
   };
-  
+
   const tinycomments_delete = (req, done) => {
-    delete conversationDb[req.conversationUid];
-  
-    setTimeout(() => {
-      done({
-        canDelete: true
-      });
-    }, fakeDelay);
+    if (currentUid === adminUid) { // Replace wth your own logic, e.g. check if user created the conversation
+      delete conversationDb[req.conversationUid];
+      setTimeout(() => done({ canDelete: true }), fakeDelay);
+    } else {
+      setTimeout(() => done({ canDelete: false, reason: 'Must be admin user' }), fakeDelay);
+    }
   };
-  
+
   const tinycomments_resolve = (req, done) => {
-    resolvedConversationDb[req.conversationUid] = conversationDb[req.conversationUid];
-    delete conversationDb[req.conversationUid];
-  
-    setTimeout(() => {
-      done({
-        canResolve: true
-      });
-    }, fakeDelay);
+    const conversation = conversationDb[req.conversationUid];
+    if (currentUid === conversation.comments[0].author) { // Replace wth your own logic, e.g. check if user has admin priveleges
+      delete conversationDb[req.conversationUid];
+      setTimeout(() => done({ canResolve: true }), fakeDelay);
+    } else {
+      setTimeout(() => done({ canResolve: false, reason: 'Must be conversation author' }), fakeDelay);
+    }
   };
-  
+
   const tinycomments_delete_comment = (req, done) => {
-    const current = conversationDb[req.conversationUid];
-    // Should be supported on browsers ...
-    current.comments = current.comments.filter((f) => {
-      return f.uid !== req.commentUid;
+    const oldcomments = conversationDb[req.conversationUid].comments;
+    let reason = 'Comment not found';
+
+    const newcomments = oldcomments.filter((comment) => {
+      if (comment.uid === req.commentUid) { // Found the comment to delete
+        if (currentUid === comment.author) { // Replace with your own logic, e.g. check if user has admin privileges
+          return false; // Remove the comment
+        } else {
+          reason = 'Not authorised to delete this comment'; // Update reason
+        }
+      }
+      return true; // Keep the comment
     });
-  
-    setTimeout(() => {
-      done({
-        canDelete: true
-      });
-    }, fakeDelay);
+    if (newcomments.length === oldcomments.length) {
+      setTimeout(() => done({ canDelete: false, reason }), fakeDelay);
+    } else {
+      conversationDb[req.conversationUid].comments = newcomments;
+      setTimeout(() => done({ canDelete: true }), fakeDelay);
+    }
   };
-  
+
   const tinycomments_edit_comment = (req, done) => {
-    const current = conversationDb[req.conversationUid];
-    // Should be supported on browsers ...
-    current.comments = current.comments.map((f) => {
-    return f.uid === req.commentUid ? {
-        ...f,
-        content: req.content,
-        modifiedAt: new Date().toISOString()
-      } : f;
+    const oldcomments = conversationDb[req.conversationUid].comments;
+    let reason = 'Comment not found';
+    let canEdit = false;
+
+    const newcomments = oldcomments.map((comment) => {
+      if (comment.uid === req.commentUid) { // Found the comment to delete
+        if (currentUid === comment.author) { // Replace with your own logic, e.g. check if user has admin privileges
+          canEdit = true; // User can edit the comment
+          return { ...comment, content: req.content, modifiedAt: new Date().toISOString() }; // Update the comment
+        } else {
+          reason = 'Not authorised to edit this comment'; // Update reason
+        }
+      }
+      return comment; // Keep the comment
     });
-  
-    setTimeout(() => {
-      done({
-        canEdit: true
-      });
-    }, fakeDelay);
+
+    if (canEdit) {
+      conversationDb[req.conversationUid].comments = newcomments;
+      setTimeout(() => done({ canEdit }), fakeDelay);
+    } else {
+      setTimeout(() => done({ canEdit, reason }), fakeDelay);
+    }
   };
-  
+
   const tinycomments_delete_all = (req, done) => {
-    Object.keys(conversationDb).forEach((k) => {
-      delete conversationDb[k];
-    });
-  
-    setTimeout(() => {
-      done({
-        canDelete: true
-      });
-    }, fakeDelay);
+    const conversation = conversationDb[req.conversationUid];
+    if (currentUid === conversation.comments[0].author) { // Replace wth your own logic, e.g. check if user has admin priveleges
+      delete conversationDb[req.conversationUid];
+      setTimeout(() => done({ canDelete: true }), fakeDelay);
+    } else {
+      setTimeout(() => done({ canDelete: false, reason: 'Must be conversation author' }), fakeDelay);
+    }
   };
-  
+
   const tinycomments_lookup = (req, done) => {
     setTimeout(() => {
       done({
         conversation: {
-        uid: conversationDb[req.conversationUid].uid,
-        comments: conversationDb[req.conversationUid].comments.slice(0)
+          uid: conversationDb[req.conversationUid].uid,
+          comments: [...conversationDb[req.conversationUid].comments]
         }
       });
     }, fakeDelay);
   };
-  
-  const tinycomments_fetch = (_, done) => {
-    setTimeout(() => done({
-      conversations: conversationDb
-    }), fakeDelay);
+
+  const tinycomments_fetch = (conversationUids, done) => {
+    const fetchedConversations = {};
+    conversationUids.forEach((uid) => {
+      const conversation = conversationDb[uid];
+      if (conversation) {
+        fetchedConversations[uid] = {...conversation};
+      }
+    });
+    setTimeout(() => done({ conversations: fetchedConversations }), fakeDelay);
   };
-  
+
+  // Read the above `getAuthorInfo` function to see how this could be implemented
+  const tinycomments_fetch_author_info = (done) => done(getAuthorInfo(currentUid));
   
   tinymce.init({
-    selector: 'textarea#comments-callback',
+    selector: 'textarea#comments-callback-with-mentions',
     license_key: 'gpl',
     toolbar: 'addcomment showcomments code | bold italic underline',
     menubar: 'file edit view insert format tools tc help',
@@ -331,5 +362,6 @@ import ('https://cdn.jsdelivr.net/npm/@faker-js/faker@9/dist/index.min.js').then
     tinycomments_delete_comment,
     tinycomments_edit_comment,
     tinycomments_fetch,
+    tinycomments_fetch_author_info
   });
 });
diff --git a/modules/ROOT/examples/live-demos/comments-callback/example.js b/modules/ROOT/examples/live-demos/comments-callback/example.js
deleted file mode 100644
index 1d944e99ee..0000000000
--- a/modules/ROOT/examples/live-demos/comments-callback/example.js
+++ /dev/null
@@ -1,235 +0,0 @@
-/********************************
- *   Tiny Comments functions    *
- * (must call "done" or "fail") *
- ********************************/
-
-const tinycomments_create = (req, done, fail) => {
-  const { content, createdAt } = req;
-
-  fetch('https://api.example/conversations/', {
-    method: 'POST',
-    body: JSON.stringify({ content: content, createdAt: createdAt }),
-    headers: {
-      'Accept': 'application/json',
-      'Content-Type': 'application/json',
-    },
-  })
-    .then((response) => {
-      if (!response.ok) {
-        throw new Error('Failed to create comment');
-      }
-      return response.json();
-    })
-    .then((req2) => {
-      const conversationUid = req2.conversationUid;
-      done({ conversationUid });
-    })
-    .catch((e) => {
-      fail(e);
-    });
-};
-
-const tinycomments_reply = (req, done, fail) => {
-  const { conversationUid, content, createdAt } = req;
-
-  fetch('https://api.example/conversations/' + conversationUid, {
-    method: 'POST',
-    body: JSON.stringify({ content: content, createdAt: createdAt }),
-    headers: {
-      'Accept': 'application/json',
-      'Content-Type': 'application/json',
-    },
-  })
-    .then((response) => {
-      if (!response.ok) {
-        throw new Error('Failed to reply to comment');
-      }
-      return response.json();
-    })
-    .then((req2) => {
-      const commentUid = req2.commentUid;
-      done({
-        commentUid: replyUid,
-        author: currentUser.id,
-        authorName: currentUser.fullName
-      });
-    })
-    .catch((e) => {
-      fail(e);
-    });
-};
-
-const tinycomments_edit_comment = (req, done, fail) => {
-  const { conversationUid, commentUid, content, modifiedAt } = req;
-
-  fetch(
-    'https://api.example/conversations/' + conversationUid + '/' + commentUid,
-    {
-      method: 'PUT',
-      body: JSON.stringify({ content: content, modifiedAt: modifiedAt }),
-      headers: {
-        'Accept': 'application/json',
-        'Content-Type': 'application/json',
-      },
-    }
-  )
-    .then((response) => {
-      if (!response.ok) {
-        throw new Error('Failed to edit comment');
-      }
-      return response.json();
-    })
-    .then((req2) => {
-      const canEdit = req2.canEdit;
-      done({ canEdit });
-    })
-    .catch((e) => {
-      fail(e);
-    });
-};
-
-const tinycomments_delete = (req, done, fail) => {
-  const conversationUid = req.conversationUid;
-  fetch('https://api.example/conversations/' + conversationUid, {
-    method: 'DELETE',
-  }).then((response) => {
-    if (response.ok) {
-      done({ canDelete: true });
-    } else if (response.status === 403) {
-      done({ canDelete: false });
-    } else {
-      fail(new Error('Something has gone wrong...'));
-    }
-  });
-};
-
-const tinycomments_delete_all = (_req, done, fail) => {
-  fetch('https://api.example/conversations', {
-    method: 'DELETE',
-  }).then((response) => {
-    if (response.ok) {
-      done({ canDelete: true });
-    } else if (response.status === 403) {
-      done({ canDelete: false });
-    } else {
-      fail(new Error('Something has gone wrong...'));
-    }
-  });
-};
-
-const tinycomments_delete_comment = (req, done, fail) => {
-  const { conversationUid, commentUid } = req;
-
-  fetch(
-    'https://api.example/conversations/' + conversationUid + '/' + commentUid,
-    {
-      method: 'DELETE',
-    }
-  ).then((response) => {
-    if (response.ok) {
-      done({ canDelete: true });
-    } else if (response.status === 403) {
-      done({ canDelete: false });
-    } else {
-      fail(new Error('Something has gone wrong...'));
-    }
-  });
-};
-
-const tinycomments_lookup = ({ conversationUid }, done, fail) => {
-  const lookup = async () => {
-    const convResp = await fetch(
-      'https://api.example/conversations/' + conversationUid
-    );
-    if (!convResp.ok) {
-      throw new Error('Failed to get conversation');
-    }
-    const comments = await convResp.json();
-    const usersResp = await fetch('https://api.example/users/');
-    if (!usersResp.ok) {
-      throw new Error('Failed to get users');
-    }
-    const { users } = await usersResp.json();
-    const getUser = (userId) => users.find((u) => u.id === userId);
-    return {
-      conversation: {
-        uid: conversationUid,
-        comments: comments.map((comment) => ({
-          ...comment,
-          content: comment.content,
-          authorName: getUser(comment.author)?.displayName,
-        })),
-      },
-    };
-  };
-  lookup()
-    .then((data) => {
-      console.log('Lookup success ' + conversationUid, data);
-      done(data);
-    })
-    .catch((err) => {
-      console.error('Lookup failure ' + conversationUid, err);
-      fail(err);
-    });
-};
-
-const tinycomments_fetch = (conversationUids, done, fail) => {
-  const requests = conversationUids.map((uid) => fetch(`https://api.example/conversations/${uid}`, {
-      method: 'GET',
-      headers: {
-        'Content-Type': 'application/json',
-      }})
-      .then((response) => response.json())
-      .then((data) => ({
-        [uid]: {
-          uid: uid,
-          comments: data
-        }
-      }))
-    );
-
-  Promise.all(requests)
-    .then((data) => {
-      console.log('data', data);
-      const conversations = data.reduce((conv, d) => ({
-          ...conv,
-          ...d
-        })
-      , {});
-      console.log(`Fetch success ${conversationUids}`, conversations);
-      done({ conversations });
-    })
-    .catch((err) => {
-      console.error(`Fetch failure ${conversationUids}`, err);
-      fail('Fetching conversations failed');
-    });
-};
-
-tinymce.init({
-  selector: 'textarea#comments-callback',
-  height: 800,
-  plugins: 'code tinycomments help lists quickbars link image',
-  toolbar:
-    'addcomment showcomments | undo redo | blocks | ' +
-    'bold italic backcolor | alignleft aligncenter ' +
-    'alignright alignjustify | bullist numlist outdent indent | ' +
-    'removeformat | help',
-  menubar: 'file edit view insert format tc',
-  sidebar_show: 'showcomments',
-  menu: {
-    tc: {
-      title: 'Comments',
-      items: 'addcomment showcomments deleteallconversations',
-    },
-  },
-  quickbars_selection_toolbar: 'alignleft aligncenter alignright | addcomment showcomments',
-  quickbars_image_toolbar: 'alignleft aligncenter alignright | rotateleft rotateright | imageoptions',
-  tinycomments_create,
-  tinycomments_reply,
-  tinycomments_edit_comment,
-  tinycomments_delete,
-  tinycomments_delete_all,
-  tinycomments_delete_comment,
-  tinycomments_lookup,
-  tinycomments_fetch,
-});
diff --git a/modules/ROOT/examples/live-demos/comments-callback/index.js b/modules/ROOT/examples/live-demos/comments-callback/index.js
index 84190beee6..58dcd8ecbe 100644
--- a/modules/ROOT/examples/live-demos/comments-callback/index.js
+++ b/modules/ROOT/examples/live-demos/comments-callback/index.js
@@ -1,725 +1,244 @@
-tinymce.ScriptLoader.loadScripts(
-  // Update to use UMD for broader compatibility browser support.
-  [
-    '//unpkg.com/@pollyjs/core@5.1.1/dist/umd/pollyjs-core.js',
-    '//unpkg.com/@pollyjs/adapter-fetch@5.1.1/dist/umd/pollyjs-adapter-fetch.js',
-    '//unpkg.com/@pollyjs/persister-local-storage@5.1.1/dist/umd/pollyjs-persister-local-storage.js',
-  ]
-).then(() => {
-  /******************************
-   * Mock server implementation *
-   ******************************/
-
-  const { Polly } = window['@pollyjs/core'];
-  const FetchAdapter = window['@pollyjs/adapter-fetch'];
-  const LocalStoragePersister = window['@pollyjs/persister-local-storage'];
+/********************************
+ *   Demo-specific configuration  *
+ ********************************/
+
+const userDb = {
+  'michaelcook': {
+    id: 'michaelcook',
+    name: 'Michael Cook',
+    fullName: 'Michael Cook',
+    description: 'Product Owner',
+    image: "{{imagesdir}}/avatars/michaelcook.png"
+  },
+  'kalebwilson': {
+    id: 'kalebwilson',
+    name: 'Kaleb Wilson',
+    fullName: 'Kaleb Wilson',
+    description: 'Marketing Director',
+    image: "{{imagesdir}}/avatars/kalebwilson.png"
+  }
+};
+
+const currentUid = 'kalebwilson';
+const adminUid = 'michaelcook';
+
+const now = new Date();
+const yesterday = new Date(now.getTime() - 24 * 60 * 60 * 1000).toISOString();
+const anhourago = new Date(now.getTime() - 60 * 60 * 1000).toISOString();
+
+const fillAuthorInfo = (id, fullName, image) => ({
+  author: id,
+  authorName: fullName,
+  authorAvatar: image,
+});
 
-  Polly.register(FetchAdapter);
-  Polly.register(LocalStoragePersister);
-  const polly = new Polly('test', {
-    adapters: ['fetch'],
-    persister: 'local-storage',
-    logging: true,
+const getAuthorInfo = (uid) => {
+  const user = userDb[uid];
+  if (user) {
+    return fillAuthorInfo(user.id, user.fullName, user.image);
+  }
+  return {
+    author: uid,
+    authorName: uid,
+  };
+};
+
+const conversationDb = {
+  'mce-conversation_19679600221621399703915': {
+    uid: 'mce-conversation_19679600221621399703915',
+    comments: [{
+      uid: 'mce-conversation_19679600221621399703915',
+      ...getAuthorInfo(currentUid),
+      content: `What do you think about this?`,
+      createdAt: yesterday,
+      modifiedAt: yesterday
+    }, {
+      uid: 'mce-conversation_19679600221621399703917',
+      ...getAuthorInfo(adminUid),
+      content: `I think this is a great idea!`,
+      createdAt: anhourago,
+      modifiedAt: anhourago,
+    }]
+  },
+  'mce-conversation_420304606321716900864126': {
+    uid: 'mce-conversation_420304606321716900864126',
+    comments: [{
+      uid: 'mce-conversation_420304606321716900864126',
+      ...getAuthorInfo(adminUid),
+      content: `Please revise this sentence, exclamation points are unprofessional!`,
+      createdAt: yesterday,
+      modifiedAt: anhourago
+    }]
+  }
+};
+
+const fakeDelay = 200;
+const randomString = () => crypto.getRandomValues(new Uint32Array(1))[0].toString(36).substring(2, 14);
+
+const resolvedConversationDb = {};
+
+/********************************
+ *   Tiny Comments functions    *
+ * (must call "done" or "fail") *
+ ********************************/
+
+const tinycomments_create = (req, done, fail) => {
+  if (req.content === 'fail') {
+    fail(new Error('Something has gone wrong...'));
+  } else {
+    const uid = 'annotation-' + randomString();
+    conversationDb[uid] = {
+      uid,
+      comments: [{
+        uid,
+        ...getAuthorInfo(currentUid),
+        content: req.content,
+        createdAt: req.createdAt,
+        modifiedAt: req.createdAt
+      }]
+    };
+    setTimeout(() => done({ conversationUid: uid }), fakeDelay);
+  }
+};
+
+const tinycomments_reply = (req, done) => {
+  const replyUid = 'annotation-' + randomString();
+  conversationDb[req.conversationUid].comments.push({
+    uid: replyUid,
+    ...getAuthorInfo(currentUid),
+    content: req.content,
+    createdAt: req.createdAt,
+    modifiedAt: req.createdAt
   });
-  const server = polly.server;
-
-  /* this would be an admin for the file, they're allowed to do all operations */
-  const getOwner = () =>
-    localStorage.getItem('owner') ?? users[0].id;
-
-  /* Server knows the author, probably by cookie or JWT token */
-  const getAuthor = () =>
-    localStorage.getItem('author') ?? users[0].id;
-
-  /* this would be an admin for the file, they're allowed to do all operations */
-  const setOwner = (user) => {
-    localStorage.setItem('owner', user) ?? users[0].id;
-  };
-
-  /* Server knows the author, probably by cookie or JWT token */
-  const setAuthor = (user) => {
-    localStorage.setItem('author', user) ?? users[0].id;
-  };
-
-  const randomString = () => {
-    const randomArray = new Uint32Array(20);
-    return window.crypto.getRandomValues(randomArray)[0].toString();
-  };
-
-  /* Our server "database" */
-  const initialDB = {
-    "mce-conversation_19679600221621399703915": [
-      {
-        uid: "mce-conversation_19679600221621399703915",
-        author: "Another Tiny User",
-        authorName: "Another Tiny User",
-        content: "Please revise this sentence, exclamation points are unprofessional!",
-        createdAt: "2021-05-19T04:48:23.914Z",
-        modifiedAt: "2021-05-19T04:48:23.914Z",
-      },
-      {
-        uid: "mce-conversation_19679600221621399703917",
-        author: "Another Tiny User",
-        authorName: "Another Tiny User",
-        content: "Replied",
-        createdAt: "2021-05-19T04:48:23.914Z",
-        modifiedAt: "2021-05-19T04:48:23.914Z",
-      },
-      {
-        uid: "mce-conversation_19679600221621399703918",
-        author: "Another Tiny User",
-        authorName: "Another Tiny User",
-        content: "Replied again",
-        createdAt: "2021-05-19T04:48:23.914Z",
-        modifiedAt: "2021-05-19T04:48:23.914Z",
-      },
-    ],
-    "mce-conversation_420304606321716900864126": [
-      {
-        uid: "mce-conversation_420304606321716900864126",
-        author: "john_smith",
-        authorName: "John Smith",
-        authorAvatar: "https://i.pravatar.cc/150?img=11",
-        content: "I think this is a great idea!",
-        createdAt: "2024-05-28T12:54:24.126Z",
-        modifiedAt: "2024-05-28T12:54:24.126Z",
-      },
-    ],
-  };
-
-  const getDB = () => JSON.parse(localStorage.getItem('fakedb') ?? JSON.stringify(initialDB));
-  const setDB = (data) => {
-    localStorage.setItem('fakedb', JSON.stringify(data));
-  };
-
-  const getConversation = (uid) => {
-    const store = getDB();
-    console.log('DB get:', uid, store[uid]);
-    return store[uid];
-  };
-
-  const setConversation = (uid, conversation) => {
-    const store = getDB();
-    console.log('DB set:', uid, store[uid], conversation);
-    store[uid] = conversation;
-    setDB(store);
-  };
-
-  const deleteConversation = (uid) => {
-    const store = getDB();
-    console.log('DB delete:', uid);
-    delete store[uid];
-    setDB(store);
-  };
-
-  const deleteAllConversations = () => {
-    console.log('DB delete all');
-    const store = {};
-    setDB(store);
-  };
-
-  server.host('https://api.example', () => {
-    /* create new conversation */
-    server.post('/conversations/').intercept((req, res) => {
-      const author = getAuthor();
-      const { content, createdAt } = JSON.parse(req.body);
-      console.log(req.body);
-      try {
-        const conversationUid = randomString();
-        setConversation(conversationUid, [
-          {
-            author,
-            createdAt,
-            modifiedAt: createdAt,
-            content,
-            uid: conversationUid /* first comment has same uid as conversation */,
-          },
-        ]);
-        res.status(201).json({ conversationUid });
-      } catch (e) {
-        console.log('Server error:', e);
-        res.status(500);
-      }
-    });
-
-    /* add new comment to conversation */
-    server.post('/conversations/:conversationUid').intercept((req, res) => {
-      const author = getAuthor();
-      const { content, createdAt } = JSON.parse(req.body);
-      const conversationUid = req.params.conversationUid;
-      try {
-        const conversation = getConversation(conversationUid);
-        const commentUid = randomString();
-        setConversation(
-          conversationUid,
-          conversation.concat([
-            {
-              author,
-              createdAt,
-              modifiedAt: createdAt,
-              content,
-              uid: commentUid,
-            },
-          ])
-        );
-        res.status(201).json({ commentUid });
-      } catch (e) {
-        console.log('Server error:', e);
-        res.status(500);
-      }
-    });
-
-    /* edit a comment */
-    server
-      .put('/conversations/:conversationUid/:commentUid')
-      .intercept((req, res) => {
-        const author = getAuthor();
-        const { content, modifiedAt } = JSON.parse(req.body);
-        const { conversationUid, commentUid } = req.params;
-
-        try {
-          const conversation = getConversation(conversationUid);
-          const commentIndex = conversation.findIndex((comment) => comment.uid === commentUid);
-          const comment = conversation[commentIndex];
-          const canEdit = comment.author === author;
-          if (canEdit) {
-            setConversation(conversationUid, [
-              ...conversation.slice(0, commentIndex),
-              {
-                ...comment,
-                content,
-                modifiedAt,
-              },
-              ...conversation.slice(commentIndex + 1),
-            ]);
-          }
-          res.status(201).json({ canEdit });
-        } catch (e) {
-          console.log('Server error:', e);
-          res.status(500);
-        }
-      });
-
-    /* delete a comment */
-    server
-      .delete('/conversations/:conversationUid/:commentUid')
-      .intercept((req, res) => {
-        const author = getAuthor();
-        const owner = getOwner();
-        const conversationUid = req.params.conversationUid;
-        const commentUid = req.params.commentUid;
-        const conversation = getConversation(conversationUid);
-        if (!conversation) {
-          res.status(404);
-        }
-        const commentIndex = conversation.findIndex((comment) => comment.uid === commentUid);
-        if (commentIndex === -1) {
-          res.status(404);
-        } else if (
-          conversation[commentIndex].author === author ||
-          author === owner
-        ) {
-          setConversation(conversationUid, [
-            ...conversation.slice(0, commentIndex),
-            ...conversation.slice(commentIndex + 1),
-          ]);
-          res.status(204);
-        } else {
-          res.status(403);
-        }
-      });
-
-    /* delete a conversation */
-    server.delete('/conversations/:conversationUid').intercept((req, res) => {
-      const author = getAuthor();
-      const owner = getOwner();
-      const conversationUid = req.params.conversationUid;
-      const conversation = getConversation(conversationUid);
-      if (conversation) {
-        if (conversation[0].author === author || author === owner) {
-          deleteConversation(conversationUid);
-          res.status(204);
-        } else {
-          res.status(403);
-        }
-      } else {
-        res.status(404);
-      }
-    });
-
-    /* delete all conversations */
-    server.delete('/conversations').intercept((req, res) => {
-      const author = getAuthor();
-      const owner = getOwner();
-      if (author === owner) {
-        deleteAllConversations();
-        res.status(204);
-      } else {
-        res.status(403);
-      }
-    });
-
-    /* lookup a conversation */
-    server.get('/conversations/:conversationUid').intercept((req, res) => {
-      const conversation = getConversation(req.params.conversationUid);
-      if (conversation) {
-        res.status(200).json(conversation);
-      } else {
-        res.status(404);
-      }
-    });
-
-    /* lookup users */
-    server.get('/users/').intercept((req, res) => {
-      res.status(200).json({
-        users,
-      });
-    });
-  }); /* server.host */
-
-  /* Connect using the `connectTo` API */
-  polly.connectTo('fetch');
-
-  /************************************************
-   * Fake Users and associated pickers            *
-   * Should be based on sessions and backend data *
-   ***********************************************/
-
-  const users = [
-    { id: 'alex', displayName: 'Alex' },
-    { id: 'jessie', displayName: 'Jessie' },
-    { id: 'sam', displayName: 'Sam' },
-  ];
-
-  /* Set initial Owner */
-  setOwner(users[2].id);
-
-  /* Set initial Author */
-  setAuthor(users[0].id);
-
-  /********************************
-   *   Tiny Comments functions    *
-   * (must call "done" or "fail") *
-   ********************************/
-
-  /**
-   * Callback for when the operation was successful.
-   * @template T
-   * @callback done
-   * @param {T} data - the data
-   * @returns {void}
-   */
-
-  /**
-   * Callback for when the operation failed.
-   * @callback fail
-   * @param {string|Error} error - the reason for the failure
-   * @returns {void}
-   */
-
-  /**
-   * The data supplied to create a comment.
-   * @typedef {Object} TinyCommentsCreateReq
-   * @property {string} content - comment content
-   * @property {string} createdAt - ISO creation date
-   */
-
-  /**
-   * The response returned when a comment was created on the server.
-   * @typedef {Object} TinyCommentsCreateResp
-   * @property {string} conversationUid - ID of created comment
-   * @property {?fail} onError - error callback to call when the comment can't be put into the document
-   * @property {?done<string>} onSuccess - success callback to call when the comment is put into the document
-   */
-
-  /**
-   * Conversation "create" function. Saves the comment as a new conversation,
-   * and asynchronously returns a conversation unique ID via the "done"
-   * callback.
-   *
-   * @param {TinyCommentsCreateReq} req - the comment to create
-   * @param {done<TinyCommentsCreateResp>} done - callback to call when the comment is created on the server
-   * @param {fail} fail - callback to call when something fails
-   */
-  const tinycomments_create = (req, done, fail) => {
-    const { content, createdAt } = req;
-
-    fetch('https://api.example/conversations/', {
-      method: 'POST',
-      body: JSON.stringify({ content: content, createdAt: createdAt }),
-      headers: {
-        'Accept': 'application/json',
-        'Content-Type': 'application/json',
-      },
-    })
-      .then((response) => {
-        if (!response.ok) {
-          throw new Error('Failed to create comment');
-        }
-        return response.json();
-      })
-      .then((req2) => {
-        const conversationUid = req2.conversationUid;
-        done({ conversationUid });
-      })
-      .catch((e) => {
-        fail(e);
-      });
-  };
-
-  /**
-   *
-   * @typedef {Object} TinyCommentsReplyReq
-   * @property {string} conversationUid
-   * @property {string} content
-   * @property {string} createdAt
-   */
-
-  /**
-   *
-   * @typedef {Object} TinyCommentsReplyResp
-   * @property {string} commentUid
-   */
-
-  /**
-   * Conversation "reply" function. Saves the comment as a reply to the
-   * an existing conversation, and asynchronously returns via the "done"
-   * callback when finished.
-   *
-   * @param {TinyCommentsReplyReq} req - the comment to append
-   * @param {done<TinyCommentsReplyResp>} done - callback to call when the comment is created on the server
-   * @param {fail} fail - callback to call when something fails
-   */
-  const tinycomments_reply = (req, done, fail) => {
-    const { conversationUid, content, createdAt } = req;
-
-    fetch('https://api.example/conversations/' + conversationUid, {
-      method: 'POST',
-      body: JSON.stringify({ content: content, createdAt: createdAt }),
-      headers: {
-        'Accept': 'application/json',
-        'Content-Type': 'application/json',
-      },
-    })
-      .then((response) => {
-        if (!response.ok) {
-          throw new Error('Failed to reply to comment');
-        }
-        return response.json();
-      })
-      .then((req2) => {
-        const commentUid = req2.commentUid;
-        done({ commentUid });
-      })
-      .catch((e) => {
-        fail(e);
-      });
-  };
-
-  /**
-   *
-   * @typedef {Object} TinyCommentsEditReq
-   * @property {string} conversationUid
-   * @property {string} commentUid
-   * @property {string} content
-   * @property {string} modifiedAt
-   */
-
-  /**
-   *
-   * @typedef {Object} TinyCommentsEditResp
-   * @property {boolean} canEdit
-   * @property {?string} reason
-   */
-
-  /**
-   *
-   * @param {TinyCommentsEditReq} req
-   * @param {done<TinyCommentsEditResp>} done
-   * @param {fail} fail
-   */
-  const tinycomments_edit_comment = (req, done, fail) => {
-    const { conversationUid, commentUid, content, modifiedAt } = req;
-
-    fetch(
-      'https://api.example/conversations/' +
-      conversationUid +
-      '/' +
-      commentUid,
-      {
-        method: 'PUT',
-        body: JSON.stringify({ content: content, modifiedAt: modifiedAt }),
-        headers: {
-          'Accept': 'application/json',
-          'Content-Type': 'application/json',
-        },
-      }
-    )
-      .then((response) => {
-        if (!response.ok) {
-          throw new Error('Failed to edit comment');
-        }
-        return response.json();
-      })
-      .then((req2) => {
-        const canEdit = req2.canEdit;
-        done({ canEdit });
-      })
-      .catch((e) => {
-        fail(e);
-      });
-  };
-
-  /**
-   *
-   * @typedef TinyCommentsDeleteReq
-   * @property {string} conversationUid
-   */
-
-  /**
-   *
-   * @typedef TinyCommentsDeleteResp
-   * @property {boolean} canDelete
-   * @property {?string} reason
-   */
-
-  /**
-   * Conversation "delete" function. Deletes an entire conversation.
-   * Returns asynchronously whether the conversation was deleted.
-   * Failure to delete due to permissions or business rules is indicated
-   * by `{canDelete: false}`, while unexpected errors should be indicated using the
-   * "fail" callback.
-   * @param {TinyCommentsDeleteReq} req
-   * @param {done<TinyCommentsDeleteResp>} done
-   * @param {fail} fail
-   */
-  const tinycomments_delete = (req, done, fail) => {
-    const conversationUid = req.conversationUid;
-    fetch('https://api.example/conversations/' + conversationUid, {
-      method: 'DELETE',
-    }).then((response) => {
-      if (response.ok) {
-        done({ canDelete: true });
-      } else if (response.status === 403) {
-        done({ canDelete: false });
+  setTimeout(() => done({ commentUid: replyUid }), fakeDelay);
+};
+
+const tinycomments_delete = (req, done) => {
+  if (currentUid === adminUid) { // Replace wth your own logic, e.g. check if user created the conversation
+    delete conversationDb[req.conversationUid];
+    setTimeout(() => done({ canDelete: true }), fakeDelay);
+  } else {
+    setTimeout(() => done({ canDelete: false, reason: 'Must be admin user' }), fakeDelay);
+  }
+};
+
+const tinycomments_resolve = (req, done) => {
+  const conversation = conversationDb[req.conversationUid];
+  if (currentUid === conversation.comments[0].author) { // Replace wth your own logic, e.g. check if user has admin priveleges
+    delete conversationDb[req.conversationUid];
+    setTimeout(() => done({ canResolve: true }), fakeDelay);
+  } else {
+    setTimeout(() => done({ canResolve: false, reason: 'Must be conversation author' }), fakeDelay);
+  }
+};
+
+const tinycomments_delete_comment = (req, done) => {
+  const oldcomments = conversationDb[req.conversationUid].comments;
+  let reason = 'Comment not found';
+
+  const newcomments = oldcomments.filter((comment) => {
+    if (comment.uid === req.commentUid) { // Found the comment to delete
+      if (currentUid === comment.author) { // Replace with your own logic, e.g. check if user has admin privileges
+        return false; // Remove the comment
       } else {
-        fail(new Error('Something has gone wrong...'));
+        reason = 'Not authorised to delete this comment'; // Update reason
       }
-    });
-  };
-
-  /**
-   *
-   * @typedef TinyCommentsDeleteAllReq
-   * @type {object}
-   */
-
-  /**
-   *
-   * @typedef TinyCommentsDeleteAllResp
-   * @property {boolean} canDelete
-   * @property {?string} reason
-   */
-
-  /**
-   * All conversations "delete_all" function. Deletes all conversations.
-   * Returns asynchronously whether all conversations were deleted.
-   * Failure to delete due to permissions or business rules is indicated
-   * by `{canDelete: false}`, while unexpected errors should be indicated using the
-   * "fail" callback.
-   * @param {TinyCommentsDeleteAllReq} _req - no options
-   * @param {done<TinyCommentsDeleteAllResp>} done
-   * @param {fail} fail
-   */
-  const tinycomments_delete_all = (_req, done, fail) => {
-    fetch('https://api.example/conversations', {
-      method: 'DELETE',
-    }).then((response) => {
-      if (response.ok) {
-        done({ canDelete: true });
-      } else if (response.status === 403) {
-        done({ canDelete: false });
+    }
+    return true; // Keep the comment
+  });
+  if (newcomments.length === oldcomments.length) {
+    setTimeout(() => done({ canDelete: false, reason }), fakeDelay);
+  } else {
+    conversationDb[req.conversationUid].comments = newcomments;
+    setTimeout(() => done({ canDelete: true }), fakeDelay);
+  }
+};
+
+const tinycomments_edit_comment = (req, done) => {
+  const oldcomments = conversationDb[req.conversationUid].comments;
+  let reason = 'Comment not found';
+  let canEdit = false;
+
+  const newcomments = oldcomments.map((comment) => {
+    if (comment.uid === req.commentUid) { // Found the comment to delete
+      if (currentUid === comment.author) { // Replace with your own logic, e.g. check if user has admin privileges
+        canEdit = true; // User can edit the comment
+        return { ...comment, content: req.content, modifiedAt: new Date().toISOString() }; // Update the comment
       } else {
-        fail(new Error('Something has gone wrong...'));
+        reason = 'Not authorised to edit this comment'; // Update reason
       }
-    });
-  };
-
-  /**
-   *
-   * @typedef TinyCommentsDeleteCommentReq
-   * @property {string} conversationUid
-   * @property {string} commentUid
-   */
-
-  /**
-   *
-   * @typedef TinyCommentsDeleteCommentResp
-   * @property {boolean} canDelete
-   * @property {?string} reason
-   */
-
-  /**
-   *
-   * @param {TinyCommentsDeleteCommentReq} req
-   * @param {done<TinyCommentsDeleteCommentResp>} done
-   * @param {fail} fail
-   */
-  const tinycomments_delete_comment = (req, done, fail) => {
-    const { conversationUid, commentUid } = req;
+    }
+    return comment; // Keep the comment
+  });
 
-    fetch(
-      'https://api.example/conversations/' +
-      conversationUid +
-      '/' +
-      commentUid,
-      {
-        method: 'DELETE',
-      }
-    ).then((response) => {
-      if (response.ok) {
-        done({ canDelete: true });
-      } else if (response.status === 403) {
-        done({ canDelete: false });
-      } else {
-        fail(new Error('Something has gone wrong...'));
+  if (canEdit) {
+    conversationDb[req.conversationUid].comments = newcomments;
+    setTimeout(() => done({ canEdit }), fakeDelay);
+  } else {
+    setTimeout(() => done({ canEdit, reason }), fakeDelay);
+  }
+};
+
+const tinycomments_delete_all = (req, done) => {
+  const conversation = conversationDb[req.conversationUid];
+  if (currentUid === conversation.comments[0].author) { // Replace wth your own logic, e.g. check if user has admin priveleges
+    delete conversationDb[req.conversationUid];
+    setTimeout(() => done({ canDelete: true }), fakeDelay);
+  } else {
+    setTimeout(() => done({ canDelete: false, reason: 'Must be conversation author' }), fakeDelay);
+  }
+};
+
+const tinycomments_lookup = (req, done) => {
+  setTimeout(() => {
+    done({
+      conversation: {
+        uid: conversationDb[req.conversationUid].uid,
+        comments: [...conversationDb[req.conversationUid].comments]
       }
     });
-  };
-
-  /**
-   * @typedef TinyCommentsLookupReq
-   * @property {string} conversationUid
-   */
-
-  /**
-   *
-   * @typedef TinyCommentsLookupRespComment
-   * @property {string} author
-   * @property {?string} authorName
-   * @property {string} createdAt
-   * @property {string} modifiedAt
-   * @property {string} content
-   * @property {string} uid
-   */
-
-  /**
-   *
-   * @typedef TinyCommentsLookupRespConversation
-   * @property {string} uid
-   * @property {TinyCommentsLookupRespComment[]} comments
-   */
-
-  /**
-   *
-   * @typedef TinyCommentsLookupResp
-   * @property {TinyCommentsLookupRespConversation} conversation
-   */
-
-  /**
-   * Conversation "lookup" function. Retreives an existing conversation
-   * via a conversation unique ID. Asynchronously returns the conversation
-   * via the "done" callback.
-   *
-   * @param {TinyCommentsLookupReq} req
-   * @param {done<TinyCommentsLookupResp>} done
-   * @param {fail} fail
-   */
-  const tinycomments_lookup = ({ conversationUid }, done, fail) => {
-    const lookup = async () => {
-      const convResp = await fetch(
-        'https://api.example/conversations/' + conversationUid
-      );
-      if (!convResp.ok) {
-        throw new Error('Failed to get conversation');
-      }
-      const comments = await convResp.json();
-      const usersResp = await fetch('https://api.example/users/');
-      if (!usersResp.ok) {
-        throw new Error('Failed to get users');
-      }
-      const { users } = await usersResp.json();
-      const getUser = (userId) => users.find((u) => u.id === userId);
-      return {
-        conversation: {
-          uid: conversationUid,
-          comments: comments.map((comment) => ({
-            ...comment,
-            content: comment.content,
-            authorName: getUser(comment.author)?.displayName,
-          })),
-        },
-      };
-    };
-    lookup()
-      .then((data) => {
-        console.log('Lookup success ' + conversationUid, data);
-        done(data);
-      })
-      .catch((err) => {
-        console.error('Lookup failure ' + conversationUid, err);
-        fail(err);
-      });
-  };
-  
-  const tinycomments_fetch = (conversationUids, done, fail) => {
-    const requests = conversationUids.map((uid) => fetch(`https://api.example/conversations/${uid}`, {
-        method: 'GET',
-        headers: {
-          'Content-Type': 'application/json',
-        }})
-        .then((response) => response.json())
-        .then((data) => ({
-          [uid]: {
-            uid: uid,
-            comments: data
-          }
-        }))
-      );
-
-    Promise.all(requests)
-      .then((data) => {
-        console.log('data', data);
-        const conversations = data.reduce((conv, d) => ({
-            ...conv,
-            ...d
-          })
-        , {});
-        console.log(`Fetch success ${conversationUids}`, conversations);
-        done({ conversations });
-      })
-      .catch((err) => {
-        console.error(`Fetch failure ${conversationUids}`, err);
-        fail('Fetching conversations failed');
-      });
-  };
-
-  tinymce.init({
-    selector: 'textarea#comments-callback',
-    height: 800,
-    plugins: 'code tinycomments help lists quickbars link image',
-    toolbar:
-      'addcomment showcomments | undo redo | blocks | ' +
-      'bold italic backcolor | alignleft aligncenter ' +
-      'alignright alignjustify | bullist numlist outdent indent | ' +
-      'removeformat | help',
-    menubar: 'file edit view insert format tc',
-    quickbars_selection_toolbar: 'alignleft aligncenter alignright | addcomment showcomments',
-    quickbars_image_toolbar: 'alignleft aligncenter alignright | rotateleft rotateright | imageoptions',
-    menu: {
-      tc: {
-        title: 'Comments',
-        items: 'addcomment showcomments deleteallconversations',
-      },
-    },
-    tinycomments_create,
-    tinycomments_reply,
-    tinycomments_edit_comment,
-    tinycomments_delete,
-    tinycomments_delete_all,
-    tinycomments_delete_comment,
-    tinycomments_lookup,
-    tinycomments_fetch,
-    sidebar_show: 'showcomments',
+  }, fakeDelay);
+};
+
+const tinycomments_fetch = (conversationUids, done) => {
+  const fetchedConversations = {};
+  conversationUids.forEach((uid) => {
+    const conversation = conversationDb[uid];
+    if (conversation) {
+      fetchedConversations[uid] = {...conversation};
+    }
   });
+  setTimeout(() => done({ conversations: fetchedConversations }), fakeDelay);
+};
+
+// Read the above `getAuthorInfo` function to see how this could be implemented
+const tinycomments_fetch_author_info = (done) => done(getAuthorInfo(currentUid));
+
+tinymce.init({
+  selector: 'textarea#comments-callback',
+  license_key: 'gpl',
+  height: 800,
+  toolbar: 'addcomment showcomments code | bold italic underline',
+  menubar: 'file edit view insert format tools tc help',
+  menu: {
+    tc: {
+      title: 'TinyComments',
+      items: 'addcomment showcomments deleteallconversations'
+    }
+  },
+  plugins: ['tinycomments', 'help', 'code', 'quickbars', 'link', 'lists', 'image'],
+  quickbars_selection_toolbar: 'alignleft aligncenter alignright | addcomment showcomments',
+  quickbars_image_toolbar: 'alignleft aligncenter alignright | rotateleft rotateright | imageoptions',
+  sidebar_show: 'showcomments',
+  tinycomments_mode: 'callback',
+  tinycomments_create,
+  tinycomments_reply,
+  tinycomments_delete,
+  tinycomments_resolve,
+  tinycomments_delete_all,
+  tinycomments_lookup,
+  tinycomments_delete_comment,
+  tinycomments_edit_comment,
+  tinycomments_fetch,
+  tinycomments_fetch_author_info,
 });
diff --git a/modules/ROOT/images/avatars/kalebwilson.png b/modules/ROOT/images/avatars/kalebwilson.png
new file mode 100644
index 0000000000..a1bf64ba7d
Binary files /dev/null and b/modules/ROOT/images/avatars/kalebwilson.png differ
diff --git a/modules/ROOT/images/avatars/michaelcook.png b/modules/ROOT/images/avatars/michaelcook.png
new file mode 100644
index 0000000000..d46b99428d
Binary files /dev/null and b/modules/ROOT/images/avatars/michaelcook.png differ
diff --git a/modules/ROOT/pages/7.8.0-release-notes.adoc b/modules/ROOT/pages/7.8.0-release-notes.adoc
index 57c9531da5..509c62a196 100644
--- a/modules/ROOT/pages/7.8.0-release-notes.adoc
+++ b/modules/ROOT/pages/7.8.0-release-notes.adoc
@@ -76,7 +76,7 @@ For information on the **Enhanced Code Editor** plugin, see: xref:advcode.adoc[E
 
 The {productname} {release-version} release includes an accompanying release of the **Comments** premium plugin.
 
-**Comments** includes the following change.
+**Comments** includes the following fix, addition and change.
 
 === A confirmation dialog now appears when resolving conversation to match the UX of deleting a conversation.
 // #TINY-11324
@@ -85,20 +85,16 @@ Previously, resolving a conversation did not trigger a confirmation dialog, unli
 
 {productname} {release-version} introduces a confirmation dialog for resolving conversations, ensuring a consistent user experience and helping prevent unintentional resolutions.
 
-For information on the **Comments** plugin, see: xref:introduction-to-tiny-comments.adoc[Introduction to {companyname} Comments].
-
-
-=== Comments
-
-The {productname} {release-version} release includes an accompanying release of the **Comments** premium plugin.
-
-**Comments** includes the following fix.
-
 === The `change` event was not dispatched when deleting a comment reply.
 // #TINY-11830
 
 Previously, deleting a comment reply did not dispatch a `change` event, which prevented the {productname} Save plugin from detecting the editor as modified. As a result, the “Save” button remained disabled after deleting a reply, potentially leading to lost changes. This issue has been resolved in {release-version}. Deleting a comment reply now correctly triggers a dirty state, ensuring the Save plugin enables the “Save” button as expected.
 
+=== New `tinycomments_fetch_author_info` option that allows integrators to specify the current author info in callback mode.
+// #TINY-11680
+
+In {productname} {release-version}, a new `+tinycomments_fetch_author_info+` callback option has been introduced, enabling integrators to provide author information in callback mode. This enhancement ensures accurate author data is displayed in new conversation cards.
+
 For information on the **Comments** plugin, see: xref:introduction-to-tiny-comments.adoc[Introduction to {companyname} Comments].
 
 === Math
diff --git a/modules/ROOT/pages/comments-callback-mode.adoc b/modules/ROOT/pages/comments-callback-mode.adoc
index f6aca219a1..85275ec9fc 100644
--- a/modules/ROOT/pages/comments-callback-mode.adoc
+++ b/modules/ROOT/pages/comments-callback-mode.adoc
@@ -15,10 +15,10 @@ All options accept functions incorporating `+done+` and `+fail+` callbacks as pa
 * The `+fail+` callback takes either a string or a JavaScript Error type.
 * The `+done+` callback takes an argument specific to each function.
 
-Most functions (create, reply, and edit) require an `+id+` identifying the *current author*.
+Most functions (create, reply, and edit) require an +id+ identifying the current author. This can be provided directly within the callbacks or dynamically via the `+tinycomments_fetch_author_info+` option.
 
 [NOTE]
-**Current author**: The {pluginname} plugin does not know the name of the current user. Determining the current user and storing the comment related to that user is required to be configured by the integrator.
+**Current author**: By default, the **Comments** plugin does not know the name of the current user. To display the correct author information when creating a new conversation, integrators can now use the `+tinycomments_fetch_author_info+` option to supply author details dynamically through a callback.
 
 During the initial editor load, the {pluginname} uses `+tinycomments_fetch+` callback to retrieve the existing conversations in the document. If not configured, the {pluginname} will fallback to `+tinycomments_lookup+`. 
 
@@ -27,8 +27,6 @@ When a user adds a comment or a reply, the {pluginname} plugin uses the `+tinyco
 [[comments-callback-live-demo]]
 == Interactive example
 
-The following example uses a simulated server (provided by link:https://netflix.github.io/pollyjs/[Polly.js]), which has been hidden from the example JavaScript to keep the example code concise. The interactions between {productname} and Polly.js are visible in the browser console.
-
 liveDemo::comments-callback[]
 
 == Options
@@ -63,11 +61,14 @@ include::partial$configuration/tinycomments_lookup.adoc[leveloffset=+1]
 
 * xref:tinycomments_resolve[`+tinycomments_resolve+`]
 * xref:tinycomments_fetch[`+tinycomments_fetch+`]
+* xref:tinycomments_fetch_author_info[`+tinycomments_fetch_author_info+`]
 
 include::partial$configuration/tinycomments_resolve.adoc[leveloffset=+1]
 
 include::partial$configuration/tinycomments_fetch.adoc[leveloffset=+1]
 
+include::partial$configuration/tinycomments_fetch_author_info.adoc[leveloffset=+1]
+
 include::partial$plugins/comments-open-sidebar.adoc[]
 
 include::partial$plugins/comments-highlighting-css.adoc[]
diff --git a/modules/ROOT/partials/configuration/tinycomments_fetch_author_info.adoc b/modules/ROOT/partials/configuration/tinycomments_fetch_author_info.adoc
new file mode 100644
index 0000000000..077409d53d
--- /dev/null
+++ b/modules/ROOT/partials/configuration/tinycomments_fetch_author_info.adoc
@@ -0,0 +1,65 @@
+[[tinycomments_fetch_author_info]]
+== `+tinycomments_fetch_author_info+`
+
+The {pluginname} plugin uses the `+tinycomments_fetch_author_info+` callback function to provide author details for comments displayed in the editor.
+
+This function is called whenever a comment is rendered, and it allows the editor to display the author’s name and avatar based on the current user.
+
+The `+tinycomments_fetch_author_info+` function is passed a `+done+` callback parameter.
+
+The function must call `+done+` with an object containing the following properties:
+
+* `+author+` (`+string+`): A unique identifier for the user.
+* `+authorName+` (`+string+`): The full name to display for the user. (`optional`)
+* `+authorAvatar+` (`+string+`): A URL pointing to the user's avatar image. (`optional`)
+
+.Example of `+tinycomments_fetch_author_info+` function
+[source,js]
+----
+const tinycomments_fetch_author_info = (done) => {
+  setTimeout(() => done({
+    author: currentUser.id, // Maps to the `author` field in the comment object
+    authorName: currentUser.fullName, // Maps to the `authorName` field in the comment object. (optional)
+    authorAvatar: currentUser.image, // Maps to the `authorAvatar` field in the comment object. (optional)
+  }), fakeDelay);
+};
+----
+
+.Example of `+tinycomments_fetch_author_info+` function with a custom author
+[source,js]
+----
+const currentUser = {
+  id: 'johnsmith',
+  name: 'John Smith',
+  fullName: 'John Smith',
+  description: 'Company Founder',
+  image: '{{imagesdir}}/users/johnsmith.png'
+};
+
+const tinycomments_fetch_author_info = (done) => {
+  fetch('https://example.api.com/currentUser')
+    .then(res => res.json())
+    .then(currentUser => {
+      done({
+        author: currentUser.id, // Maps to the `author` field in the comment object
+        authorName: currentUser.fullName, // Maps to the `authorName` field in the comment object. (optional)
+        authorAvatar: currentUser.image, // Maps to the `authorAvatar` field in the comment object. (optional)
+      });
+    });
+};
+
+tinymce.init({
+  selector: '#editor',
+  plugins: 'tinycomments',
+  tinycomments_mode: 'callback',
+  tinycomments_create: create_comment,
+  tinycomments_reply: reply_comment,
+  tinycomments_edit_comment: edit_comment,
+  tinycomments_delete: delete_comment_thread,
+  tinycomments_delete_all: delete_all_comment_threads,
+  tinycomments_delete_comment: delete_comment,
+  tinycomments_lookup: lookup_comment,
+  tinycomments_fetch: fetch_comments, // Optional callback
+  tinycomments_fetch_author_info: fetch_comments
+});
+----
\ No newline at end of file