diff --git a/README.md b/README.md
index 3424ccb86..d85cf575a 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://ElenaGrasovskaya.github.io/react_person/) and add it to the PR description.
diff --git a/src/App.jsx b/src/App.jsx
index dcf8509c8..af97ebf38 100644
--- a/src/App.jsx
+++ b/src/App.jsx
@@ -1,7 +1,8 @@
 import React from 'react';
 import './App.scss';
+import { Person } from './components/Person/Person';
 
-export const misha = {
+const misha = {
   name: 'Misha',
   age: 37,
   sex: 'm',
@@ -9,14 +10,14 @@ export const misha = {
   partnerName: 'Natasha',
 };
 
-export const olya = {
+const olya = {
   name: 'Olya',
   sex: 'f',
   isMarried: true,
   partnerName: 'Maksym',
 };
 
-export const alex = {
+const alex = {
   name: 'Alex',
   age: 25,
   sex: 'm',
@@ -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/App.scss b/src/App.scss
index 223ec3872..c17d529f4 100644
--- a/src/App.scss
+++ b/src/App.scss
@@ -1,20 +1,3 @@
 iframe {
   display: none;
 }
-
-.Person {
-  width: fit-content;
-  margin-bottom: 16px;
-  padding: 8px;
-  border: 1px solid #000;
-  border-radius: 8px;
-
-  &__name {
-    margin-top: 8px;
-  }
-
-  &__age {
-    color: #00f;
-    font-weight: bold;
-  }
-}
diff --git a/src/components/Person/Person.jsx b/src/components/Person/Person.jsx
index eccf156a3..5eb8f506d 100644
--- a/src/components/Person/Person.jsx
+++ b/src/components/Person/Person.jsx
@@ -1 +1,27 @@
-// export const Person = ({ person }) => ();
+import './Person.scss';
+
+export const Person = ({ person }) => {
+  const isMale = person.sex === 'm';
+
+  return (
+    <section className="Person">
+      <h2 className="Person__name">
+        {`My name is ${person.name}`}
+      </h2>
+
+      {person.age && (
+        <p className="Person__age">
+          {`I am ${person.age}`}
+        </p>
+      )
+      }
+      {person.isMarried ? (
+        <p className="Person__partner">
+          {`${person.partnerName} is my ${isMale ? 'wife' : 'husband'}`}
+        </p>
+      ) : (
+        <p className="Person__partner">I am not married</p>
+      )}
+    </section>
+  );
+};
diff --git a/src/components/Person/Person.scss b/src/components/Person/Person.scss
new file mode 100644
index 000000000..295d86200
--- /dev/null
+++ b/src/components/Person/Person.scss
@@ -0,0 +1,16 @@
+.Person {
+  width: fit-content;
+  margin-bottom: 16px;
+  padding: 8px;
+  border: 1px solid #000;
+  border-radius: 8px;
+
+  &__name {
+    margin-top: 8px;
+  }
+
+  &__age {
+    color: #00f;
+    font-weight: bold;
+  }
+}