diff --git a/README.md b/README.md
index 3424ccb86..dbdb7fc43 100644
--- a/README.md
+++ b/README.md
@@ -12,4 +12,4 @@ and use it 3 times inside the `App` instead of static markup.
 ## Instructions
 - 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://evelina-moore.github.io/react_person/) and add it to the PR description.
diff --git a/src/App.jsx b/src/App.jsx
index dcf8509c8..eb6735128 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 = {
@@ -25,21 +26,8 @@ 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>
+    <Person person={misha} />
+    <Person person={olya} />
+    <Person person={alex} />
   </div>
 );
diff --git a/src/components/Person/Person.jsx b/src/components/Person/Person.jsx
index eccf156a3..108808191 100644
--- a/src/components/Person/Person.jsx
+++ b/src/components/Person/Person.jsx
@@ -1 +1,31 @@
-// export const Person = ({ person }) => ();
+export const Person = ({ person }) => {
+  const { name, age, sex, isMarried, partnerName } = person;
+
+  const genderPartner = sex === 'm' ? 'wife' : 'husband';
+
+  let partnerText;
+
+  if (isMarried) {
+    partnerText = `${partnerName} is my ${genderPartner}`;
+  } else {
+    partnerText = 'I am not married';
+  }
+
+  return (
+    <section className="Person">
+      <h2 className="Person__name">
+        My name is
+        {' '}
+        {name}
+      </h2>
+      {age && (
+      <p className="Person__age">
+        I am
+        {' '}
+        {age}
+      </p>
+      )}
+      <p className="Person__partner">{partnerText}</p>
+    </section>
+  );
+};