Working version, trying to tweak the new comment display