diff --git a/task-1/leap-year.js b/task-1/leap-year.js
index e05d215..ad890fd 100644
--- a/task-1/leap-year.js
+++ b/task-1/leap-year.js
@@ -1,9 +1,18 @@
-import promptSync from 'prompt-sync';
+import promptSync from "prompt-sync";
 const prompt = promptSync();
 
+const year = Number(prompt("Enter a year to check if it is a leap year: "));
 
-// Write your code here
-// Guidance:
-// Step 1: prompt the user to enter a year
-// Step 2: convert the user input to a number so we can perform calculations
-// Step 3: Implement the logic
+const isLeapYear = year % 400 === 0 || (year % 4 === 0 && year % 100 !== 0);
+
+if (Number.isNaN(year)) {
+  console.log("Please, enter a number");
+} else if (!Number.isInteger(year)) {
+  console.log("Please, enter a whole number (no decimals)");
+} else if (year < 1 || year > 9999) {
+  console.log("Invalid year!");
+} else if (isLeapYear) {
+  console.log(`Yes, ${year} is a leap year`);
+} else {
+  console.log(`No, ${year} is not a leap year`);
+}
diff --git a/task-2/login.js b/task-2/login.js
index ca9ba92..fb27a7d 100644
--- a/task-2/login.js
+++ b/task-2/login.js
@@ -1,12 +1,27 @@
 // Do not change the line below
-import { errorMessage, successMessage } from './app.js';
+import { errorMessage, successMessage } from "./app.js";
 
 let incorrectAttempts = 0;
 
 function onLogin(username, password) {
-  // Write your code here.
-  // Use the variables 'username' and 'password' to access the input values
-  // Use incorrectAttempts to track the number of failed attempts
+  const isValid =
+    (username === "admin" && password === "Hack1234") ||
+    (username === "user" && password === "7654321");
+
+  if (incorrectAttempts > 3) {
+    errorMessage("Login blocked: Too many incorrect attempts");
+    return;
+  } else if (isValid) {
+    incorrectAttempts = 0;
+    successMessage("Logged in successfully");
+  } else {
+    incorrectAttempts++;
+    if (incorrectAttempts === 4) {
+      errorMessage("Login blocked: Too many incorrect attempts");
+    } else {
+      errorMessage("Incorrect credentials");
+    }
+  }
 }
 
 // Do not change the line below
diff --git a/task-3/converter.js b/task-3/converter.js
index 0f54a18..a498963 100644
--- a/task-3/converter.js
+++ b/task-3/converter.js
@@ -5,10 +5,11 @@ const prompt = promptSync();
 const EUR_USD_RATE = 1.1643;
 
 // Menu display
-conole.log("Hello and welcome to the currency converter. Please choose: ");
+console.log("Hello and welcome to the currency converter. Please choose: ");
 console.log("1: Convert EUR to USD");
 console.log("2: Convert USD to EUR");
-const menuSelection = prompt("Select your option [1 or 2]: ");
+console.log("3: Display the current exchange rate");
+const menuSelection = prompt("Select your option [1, 2 or 3]: ");
 
 console.log("\n");
 
@@ -16,7 +17,7 @@ if (menuSelection === "1") {
   // EUR to USD
   const eurAmountInput = prompt("Enter amount in EUR: ");
   const eurAmountNum = Number(eurAmountInput);
-  if (Number.isNaN(eurAmountNum) || eurAmountNum > 0) {
+  if (Number.isNaN(eurAmountNum) || eurAmountNum <= 0) {
     console.log("Please enter a valid positive number for the amount.");
   } else {
     const usdAmount = eurAmountNum * EUR_USD_RATE;
@@ -26,12 +27,14 @@ if (menuSelection === "1") {
   // USD to EUR
   const usdAmountInput = prompt("Enter amount in USD: ");
   const usdAmountNum = Number(usdAmountInput);
-  if (Number.isNaN(usdAmountNum) || usdAmountNum < 0) {
+  if (Number.isNaN(usdAmountNum) || usdAmountNum <= 0) {
     console.log("Please enter a valid positive number for the amount.");
   } else {
-    const eurAmount = usdAmountNum / eur_usd_rate;
-    console.log(usdAmountNum.toFixed(2) + ' USD is equal to ' + usdAmountNum.toFixed(2) + ' EUR.');
+    const eurAmount = usdAmountNum / EUR_USD_RATE;
+    console.log(usdAmountNum.toFixed(2) + ' USD is equal to ' + eurAmount.toFixed(2) + ' EUR.');
   }
+} else if(menuSelection === "3"){
+  console.log(`The current exchange rate is 1 EUR = ${EUR_USD_RATE} USD.`)
 } else {
-  console.log("Invalid selection. Please choose either 1 or 2.");
+  console.log("Invalid selection. Please choose either 1, 2 or 3");
 }