diff --git a/README.md b/README.md
index ab3abde58..81b9a5d33 100644
--- a/README.md
+++ b/README.md
@@ -13,4 +13,4 @@ This task is similar to [Static List of TODOs](https://github.com/mate-academy/r
 - Install Prettier Extention and use this [VSCode settings](https://mate-academy.github.io/fe-program/tools/vscode/settings.json) to enable format on save.
 - Implement a solution following the [React task guideline](https://github.com/mate-academy/react_task-guideline#react-tasks-guideline).
 - Open one more terminal and run tests with `npm test` to ensure your solution is correct.
-- Replace `<your_account>` with your Github username in the [DEMO LINK](https://<your_account>.github.io/react_static-list-of-posts-js/) and add it to the PR description.
+- Replace `<your_account>` with your Github username in the [DEMO LINK](https://Maas1m.github.io/react_static-list-of-posts-js/) and add it to the PR description.
diff --git a/src/components/CommentInfo/CommentInfo.jsx b/src/components/CommentInfo/CommentInfo.jsx
index ec352ee4e..57e03e833 100644
--- a/src/components/CommentInfo/CommentInfo.jsx
+++ b/src/components/CommentInfo/CommentInfo.jsx
@@ -10,21 +10,19 @@ export const CommentInfo = ({comment}) =>
           className="CommentInfo__email"
           href="mailto:Telly_Lynch@karl.co.uk"
         >
-          Telly_Lynch@karl.co.uk
+          {comment.email}
         </a>
       </div>
 
       <div className="CommentInfo__body">
-        dolorum voluptas laboriosam quisquam ab totam beatae et aut
-        aliquid optio assumenda voluptas velit itaque quidem voluptatem
-        tempore cupiditate in itaque sit molestiae minus dolores magni
+        {comment.body}
       </div>
     </div>
 
     <div className="CommentInfo">
       <div className="CommentInfo__title">
         <strong className="CommentInfo__name">
-          odio adipisci rerum aut animi
+          {comment.name}
         </strong>
 
         {' by '}
@@ -33,15 +31,12 @@ export const CommentInfo = ({comment}) =>
           className="CommentInfo__email"
           href="mailto:Nikita@garfield.biz"
         >
-          Nikita@garfield.biz
+          {comment.email}
         </a>
       </div>
 
       <div className="CommentInfo__body">
-        quia molestiae reprehenderit quasi aspernatur aut expedita
-        occaecati aliquam eveniet laudantium omnis quibusdam delectus
-        saepe quia accusamus maiores nam est cum et ducimus et vero
-        voluptates excepturi deleniti ratione
+        {comment.body}
       </div>
     </div>
 
diff --git a/src/components/PostInfo/PostInfo.jsx b/src/components/PostInfo/PostInfo.jsx
index efad724fc..24f5c4070 100644
--- a/src/components/PostInfo/PostInfo.jsx
+++ b/src/components/PostInfo/PostInfo.jsx
@@ -2,25 +2,32 @@ import { CommentList } from "../CommentList/CommentList";
 import { UserInfo } from "../UserInfo/UserInfo";
 
 
-export const PostInfo = ({post }) =>
-    <div className="PostInfo">
-      <div className="PostInfo__header">
-        <h3 className="PostInfo__title">{ post.title}</h3>
-
-        <p>
-          {' Posted by  '}
-
-          <UserInfo user={user} />
-        </p>
-      </div>
-
-      <p className="PostInfo__body">
-        est rerum tempore vitae sequi sint nihil reprehenderit dolor beatae ea
-        dolores neque fugiat blanditiis voluptate porro vel nihil molestiae ut
-        reiciendis qui aperiam non debitis possimus qui neque nisi nulla
-      </p>
+export const PostInfo = ({ post }) =>
+  <div className="PostInfo">
+    <div className="PostInfo__header">
+      <h3 className="PostInfo__title">{post.title}</h3>
 
-      <hr />
+      <p>
+        {' Posted by  '}
 
-      <b data-cy="NoCommentsMessage">No comments yet <CommentList comments={commentsFromServer} /></b>
+        <UserInfo user={user} />
+      </p>
     </div>
+
+    <p className="PostInfo__body">
+      {post.body}
+    </p>
+
+    <hr />
+
+    <b data-cy="NoCommentsMessage">{comment ? <CommentList comments={commentsFromServer} /> : 'No comments yet'} </b>
+
+    <b data-cy="NoCommentsMessage">No comments yet</b>
+  </div>
+
+//  < a
+// className = "CommentInfo__email"
+// href = "mailto:Nikita@garfield.biz"
+//   >
+//   Nikita@garfield.biz
+//   </a >
diff --git a/src/components/UserInfo/UserInfo.jsx b/src/components/UserInfo/UserInfo.jsx
index d33b2f357..a9648834b 100644
--- a/src/components/UserInfo/UserInfo.jsx
+++ b/src/components/UserInfo/UserInfo.jsx
@@ -1,4 +1,4 @@
-export const UserInfo = () =>
+export const UserInfo = ({user}) =>
   <a className="UserInfo" href={`mailto:${user.email}`}>
     {user.name}
   </a>