diff --git a/.gitignore b/.gitignore
index c6f9a44..fc34e83 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 .vscode/settings.json
+part2/countries/.env
diff --git a/part2/countries/src/components/Countries.js b/part2/countries/src/components/Countries.js
index e9c3492..03c654b 100644
--- a/part2/countries/src/components/Countries.js
+++ b/part2/countries/src/components/Countries.js
@@ -1,23 +1,17 @@
-import { useState } from "react";
 import CountryData from "./CountryData";
 
-const Countries = ({ showedCountries }) => {
-  const [country, setCountry] = useState("");
+const Countries = ({ showedCountries, setShowedCountries }) => {
   if (showedCountries.length === 1) {
     return <CountryData country={showedCountries[0]} />;
   } else if (showedCountries.length <= 10) {
-    return (
-      <div>
-        {showedCountries.map((country) => (
-          <div key={country.cca3}>
-            {country.name.common}{" "}
-            <button onClick={() => setCountry(country)}>show</button>
-          </div>
-        ))}
-        {country && <CountryData country={country} />}
+    return showedCountries.map((country) => (
+      <div key={country.cca3}>
+        {country.name.official}
+        {""}
+        <button onClick={() => setShowedCountries([country])}>Show</button>
       </div>
-    );
-  } else if (showedCountries.length > 10) {
+    ));
+  } else {
     return <div>Too many matches, specify another filter</div>;
   }
 };
diff --git a/part2/countries/src/components/CountryData.js b/part2/countries/src/components/CountryData.js
index c088917..6e2c7e4 100644
--- a/part2/countries/src/components/CountryData.js
+++ b/part2/countries/src/components/CountryData.js
@@ -1,3 +1,5 @@
+import Weather from "./Weather";
+
 const CountryData = ({ country }) => {
   return (
     <div>
@@ -11,6 +13,7 @@ const CountryData = ({ country }) => {
         ))}
       </ul>
       <img src={country.flags.png} alt={`${country.name.common} flag`} />
+      <Weather capital={country.capital} />
     </div>
   );
 };
diff --git a/part2/countries/src/components/Weather.js b/part2/countries/src/components/Weather.js
new file mode 100644
index 0000000..0058842
--- /dev/null
+++ b/part2/countries/src/components/Weather.js
@@ -0,0 +1,30 @@
+import { useState, useEffect } from "react";
+import axios from "axios";
+
+const Weather = ({ capital }) => {
+  const OPENWEATHER_API_KEY = process.env.REACT_APP_OPENWEATHER_API_KEY;
+  const [weather, setWeather] = useState([]);
+
+  useEffect(() => {
+    axios
+      .get(
+        `https://api.openweathermap.org/data/2.5/weather?q=${capital}&units=metric&appid=${OPENWEATHER_API_KEY}`
+      )
+      .then((response) => {
+        setWeather(response.data);
+      });
+  }, [OPENWEATHER_API_KEY, capital]);
+  return weather.weather ? (
+    <div>
+      <h2>Weather in {capital}</h2>
+      <div>Temperature: {weather.main.temp}°C</div>
+      <img
+        alt="weather icon"
+        src={`http://openweathermap.org/img/wn/${weather.weather[0].icon}@2x.png`}
+      />
+      <div>Wind: {weather.wind.speed}m/s</div>
+    </div>
+  ) : null;
+};
+
+export default Weather;