diff --git a/task-1/leap-year.js b/task-1/leap-year.js
index e05d215..619564d 100644
--- a/task-1/leap-year.js
+++ b/task-1/leap-year.js
@@ -1,7 +1,19 @@
-import promptSync from 'prompt-sync';
+import promptSync from "prompt-sync";
 const prompt = promptSync();
 
+const year = +prompt("Enter a year: ");
 
+if (isNaN(year)) {
+  console.log("Please enter a year using NUMBERS only");
+} else if (!Number.isInteger(year)) {
+  console.log("Enter INTEGER numbers please");
+} else if (year < 1 || year > 9999) {
+  console.log("Invalid year!");
+} else if (year % 400 === 0 || (year % 100 !== 0 && year % 4 === 0)) {
+  console.log(`Yes, ${year} is a leap year`);
+} else {
+  console.log(`No, ${year} is a not leap year`);
+}
 // Write your code here
 // Guidance:
 // Step 1: prompt the user to enter a year
diff --git a/task-2/login.js b/task-2/login.js
index ca9ba92..e35f9c6 100644
--- a/task-2/login.js
+++ b/task-2/login.js
@@ -1,13 +1,23 @@
-// Do not change the line below
-import { errorMessage, successMessage } from './app.js';
+import { errorMessage, successMessage } from "./app.js";
 
 let incorrectAttempts = 0;
+const loginButton = document.getElementById("loginButton");
 
 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
+  if (
+    ((username === "admin" && password === "Hack1234") ||
+      (username === "user" && password === "7654321")) &&
+    incorrectAttempts < 3) {
+    successMessage("Logged in successfully");
+    incorrectAttempts = 0;
+  } else {
+    errorMessage("Incorrect credentials");
+    incorrectAttempts += 1;
+    if (incorrectAttempts > 3) {
+      loginButton.disabled = true;
+      errorMessage("Login blocked: Too many incorrect attempts");
+    }
+  }
 }
 
-// Do not change the line below
 export { onLogin };
diff --git a/task-3/converter.js b/task-3/converter.js
index 0f54a18..b64eadc 100644
--- a/task-3/converter.js
+++ b/task-3/converter.js
@@ -1,14 +1,15 @@
-import promptSync from 'prompt-sync';
+import promptSync from "prompt-sync";
 const prompt = promptSync();
 
 // Exchange rate for EUR/USD (How much 1 EUR is in USD)
 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,22 +17,35 @@ 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;
-    console.log(eurAmountNum.toFixed(2) + ' EUR is equal to ' + usdAmount.toFixed(2) + ' USD.');
+    console.log(
+      eurAmountNum.toFixed(2) +
+        " EUR is equal to " +
+        usdAmount.toFixed(2) +
+        " USD.",
+    );
   }
 } else if (menuSelection === "2") {
   // 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") {
+  // show exchange rate
+  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.");
 }