diff --git a/task-1/leap-year.js b/task-1/leap-year.js
index e05d215..c2f1bd3 100644
--- a/task-1/leap-year.js
+++ b/task-1/leap-year.js
@@ -4,6 +4,18 @@ const prompt = promptSync();
 
 // 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 input = prompt("Enter a year: ");
+const year = Number(input);
+
+if (Number.isNaN(year) || year < 1 || year > 9999) {
+     console.log("Invalid year!");
+} else {
+    const isLeap = 
+    ((year % 4 === 0 && year % 100 !== 0) || (year % 400 === 0));
+ 
+    if (isLeap) {
+        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..3e9fc34 100644
--- a/task-2/login.js
+++ b/task-2/login.js
@@ -4,10 +4,23 @@ 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
-}
+   if (incorrectAttempts >= 3) {
+    errorMessage("Login blocked: Too many incorrect attempts.");
+    
+    return;
+
+   } 
+    const isAdmin = (username === "admin" && password === "Hack1234");
+    const isUser = (username === "user" && password === "7654321");
+    
+    if (isAdmin || isUser) {
+        successMessage("Logged in successfully!");
+    } else {
+        incorrectAttempts++;
+        errorMessage("Incorrect credentials.");
+        
+    }
+   }
+
 
-// Do not change the line below
 export { onLogin };
diff --git a/task-3/converter.js b/task-3/converter.js
index 0f54a18..ab86c78 100644
--- a/task-3/converter.js
+++ b/task-3/converter.js
@@ -2,13 +2,15 @@ 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;
+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,10 +18,10 @@ 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;
+    const usdAmount = eurAmountNum * eur_usd_rate;
     console.log(eurAmountNum.toFixed(2) + ' EUR is equal to ' + usdAmount.toFixed(2) + ' USD.');
   }
 } else if (menuSelection === "2") {
@@ -30,8 +32,13 @@ if (menuSelection === "1") {
     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.');
+    console.log(usdAmountNum.toFixed(2) + ' USD is equal to ' + eurAmount.toFixed(2) + ' EUR.');
   }
-} else {
-  console.log("Invalid selection. Please choose either 1 or 2.");
+} else if (menuSelection === "3") {
+  // Display exchange rate
+  console.log("The current exchange rate is 1 EUR = " + eur_usd_rate.toFixed(4) + " USD");
+
+}
+ else {
+  console.log("Invalid selection. Please choose either 1, 2 or 3.");
 }