diff --git a/README.md b/README.md
index 009a2977c..d5e19df37 100644
--- a/README.md
+++ b/README.md
@@ -13,4 +13,4 @@ and use it 3 times inside the `App` instead of static markup.
 - 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_person/) and add it to the PR description.
+- Replace `<your_account>` with your Github username in the [DEMO LINK](https://Nazarin565.github.io/react_person/) and add it to the PR description.
diff --git a/src/App.jsx b/src/App.jsx
index dcf8509c8..741099881 100644
--- a/src/App.jsx
+++ b/src/App.jsx
@@ -1,4 +1,5 @@
 import React from 'react';
+import { Person } from './components/Person/Person';
 import './App.scss';
 
 export const misha = {
@@ -24,22 +25,9 @@ export const alex = {
 };
 
 export const App = () => (
-  <div className="App">
-    <section className="Person">
-      <h2 className="Person__name">My name is Misha</h2>
-      <p className="Person__age">I am 37</p>
-      <p className="Person__partner">Natasha is my wife</p>
-    </section>
-
-    <section className="Person">
-      <h2 className="Person__name">My name is Olya</h2>
-      <p className="Person__partner">Maksym is my husband</p>
-    </section>
-
-    <section className="Person">
-      <h2 className="Person__name">My name is Alex</h2>
-      <p className="Person__age">I am 25</p>
-      <p className="Person__partner">I am not married</p>
-    </section>
-  </div>
+  <>
+    <Person person={misha} />
+    <Person person={olya} />
+    <Person person={alex} />
+  </>
 );
diff --git a/src/App.scss b/src/App.scss
index 223ec3872..21274fdb6 100644
--- a/src/App.scss
+++ b/src/App.scss
@@ -16,5 +16,9 @@ iframe {
   &__age {
     color: #00f;
     font-weight: bold;
+
+    &--hidden {
+      display: none;
+    }
   }
 }
diff --git a/src/components/Person/Person.jsx b/src/components/Person/Person.jsx
index eccf156a3..d5d3cbf44 100644
--- a/src/components/Person/Person.jsx
+++ b/src/components/Person/Person.jsx
@@ -1 +1,17 @@
-// export const Person = ({ person }) => ();
+export const Person = ({ person }) => {
+  const partner = person.sex === 'm' ? 'wife' : 'husband';
+
+  return (
+    <div className="App">
+      <section className="Person">
+        <h2 className="Person__name">My name is {person.name}</h2>
+        {person.age && <p className="Person__age">I am {person.age}</p>}
+        <p className="Person__partner">
+          {person.isMarried
+            ? `${person.partnerName} is my ${partner}`
+            : 'I am not married'}
+        </p>
+      </section>
+    </div>
+  );
+};