diff --git a/4chan_x.user.js b/4chan_x.user.js
index 86808f414..0ea4fc9fd 100644
--- a/4chan_x.user.js
+++ b/4chan_x.user.js
@@ -858,24 +858,35 @@
       var a, replyID, threadID, _, _ref;
       e.preventDefault();
       _ref = this.href.match(/(\d+)#p(\d+)/), _ = _ref[0], threadID = _ref[1], replyID = _ref[2];
-      this.textContent = "Loading " + replyID + "...";
+      this.textContent = "Loading No." + replyID + "...";
       a = this;
-      return $.cache(this.pathname, function() {
+      return $.cache("//api.4chan.org" + this.pathname + ".json", function() {
         return ExpandComment.parse(this, a, threadID, replyID);
       });
     },
     parse: function(req, a, threadID, replyID) {
-      var doc, href, node, post, quote, quotes, _i, _len;
+      var bq, href, post, posts, quote, quotes, _i, _j, _len, _len1;
       if (req.status !== 200) {
         a.textContent = "" + req.status + " " + req.statusText;
         return;
       }
-      doc = d.implementation.createHTMLDocument('');
-      doc.documentElement.innerHTML = req.response;
-      node = d.importNode(doc.getElementById("m" + replyID), true);
-      quotes = node.getElementsByClassName('quotelink');
-      for (_i = 0, _len = quotes.length; _i < _len; _i++) {
-        quote = quotes[_i];
+      posts = JSON.parse(req.response).posts;
+      replyID = +replyID;
+      for (_i = 0, _len = posts.length; _i < _len; _i++) {
+        post = posts[_i];
+        if (post.no === replyID) {
+          break;
+        }
+      }
+      if (post.no !== replyID) {
+        a.textContent = 'No.#{replyID} not found.';
+        return;
+      }
+      bq = $.id("m" + replyID);
+      bq.innerHTML = post.com;
+      quotes = bq.getElementsByClassName('quotelink');
+      for (_j = 0, _len1 = quotes.length; _j < _len1; _j++) {
+        quote = quotes[_j];
         href = quote.getAttribute('href');
         if (href[0] === '/') {
           continue;
@@ -883,7 +894,7 @@
         quote.href = "res/" + href;
       }
       post = {
-        blockquote: node,
+        blockquote: bq,
         threadID: threadID,
         quotes: quotes,
         backlinks: []
@@ -903,8 +914,7 @@
       if (Conf['Indicate Cross-thread Quotes']) {
         QuoteCT.node(post);
       }
-      $.replace(a.parentNode.parentNode, node);
-      return Main.prettify(node);
+      return Main.prettify(bq);
     }
   };
 
diff --git a/changelog b/changelog
index e16c8f27b..c046ad4ce 100644
--- a/changelog
+++ b/changelog
@@ -4,6 +4,7 @@ master
     - Thread Updater.
     - Quote Inlining.
     - Quote Previewing.
+    - Comment Expansion.
 
 2.34.10
 - Mayhem
diff --git a/script.coffee b/script.coffee
index d29f6f128..63709ca3e 100644
--- a/script.coffee
+++ b/script.coffee
@@ -706,28 +706,32 @@ ExpandComment =
   expand: (e) ->
     e.preventDefault()
     [_, threadID, replyID] = @href.match /(\d+)#p(\d+)/
-    @textContent = "Loading #{replyID}..."
+    @textContent = "Loading No.#{replyID}..."
     a = @
-    $.cache @pathname, -> ExpandComment.parse @, a, threadID, replyID
+    $.cache "//api.4chan.org#{@pathname}.json", -> ExpandComment.parse @, a, threadID, replyID
   parse: (req, a, threadID, replyID) ->
     if req.status isnt 200
       a.textContent = "#{req.status} #{req.statusText}"
       return
 
-    doc = d.implementation.createHTMLDocument ''
-    doc.documentElement.innerHTML = req.response
+    posts = JSON.parse(req.response).posts
+    replyID = +replyID
 
-    # Import the node to fix quote.hashes
-    # as they're empty when in a different document.
-    node = d.importNode doc.getElementById("m#{replyID}"), true
+    for post in posts
+      break if post.no is replyID
+    if post.no isnt replyID
+      a.textContent = 'No.#{replyID} not found.'
+      return
 
-    quotes = node.getElementsByClassName 'quotelink'
+    bq = $.id "m#{replyID}"
+    bq.innerHTML = post.com
+    quotes = bq.getElementsByClassName 'quotelink'
     for quote in quotes
       href = quote.getAttribute 'href'
       continue if href[0] is '/' # Cross-board quote
       quote.href = "res/#{href}" # Fix pathnames
     post =
-      blockquote: node
+      blockquote: bq
       threadID:   threadID
       quotes:     quotes
       backlinks:  []
@@ -741,8 +745,7 @@ ExpandComment =
       QuoteOP.node      post
     if Conf['Indicate Cross-thread Quotes']
       QuoteCT.node      post
-    $.replace a.parentNode.parentNode, node
-    Main.prettify node
+    Main.prettify bq
 
 ExpandThread =
   init: ->