diff --git a/task-1/leap-year.js b/task-1/leap-year.js
index e05d215..3bf6a17 100644
--- a/task-1/leap-year.js
+++ b/task-1/leap-year.js
@@ -1,9 +1,17 @@
-import promptSync from 'prompt-sync';
+import promptSync from "prompt-sync";
 const prompt = promptSync();
 
+const input_year = prompt("Enter a year(1-9999):  ");
+const year = Number(input_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
+if (!Number.isInteger(year) || year < 1 || year > 9999) {
+  console.log("Invalid year!");
+} else {
+  const isLeap = year % 400 === 0 || (year % 4 === 0 && year % 100 !== 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/app.js b/task-2/app.js
index 8c31bc5..644aa5e 100644
--- a/task-2/app.js
+++ b/task-2/app.js
@@ -19,13 +19,12 @@ function showMessage(message, type) {
 
   modal.classList.remove('hidden');
 }
-
 function errorMessage(message) {
-  showMessage(message, 'error');
+  showMessage(message, "error");
 }
 
 function successMessage(message) {
-  showMessage(message, 'success');
+  showMessage(message, "success");
 }
 
 function hideModal() {
@@ -78,4 +77,5 @@ function setupEventListeners() {
 
 setupEventListeners();
 
-export { errorMessage, successMessage };
+export { showMessage };
+
diff --git a/task-2/login.js b/task-2/login.js
index ca9ba92..63c7559 100644
--- a/task-2/login.js
+++ b/task-2/login.js
@@ -1,12 +1,35 @@
 // Do not change the line below
-import { errorMessage, successMessage } from './app.js';
+import { showMessage } 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 >= 4) {
+    showMessage("Login blocked: Too many incorrect attempts", "error");
+    return;
+  }
+
+  // 2) check valid credentials
+  const isValid =
+    (username === "admin" && password === "Hack1234") ||
+    (username === "user" && password === "7654321");
+
+  if (isValid) {
+    showMessage("Logged in successfully", "success");
+    incorrectAttempts = 0;
+  } else {
+    incorrectAttempts += 1;
+
+    // after increment, if now blocked -> show blocked (requirement 3+4)
+    if (incorrectAttempts >= 4) {
+      showMessage("Login blocked: Too many incorrect attempts", "error");
+    } else {
+      showMessage("Incorrect credentials", "error");
+    }
+  }
 }
 
 // Do not change the line below
diff --git a/task-3/converter.js b/task-3/converter.js
index 0f54a18..8d4a625 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: ");//1 bug
 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) {//2 bug
     console.log("Please enter a valid positive number for the amount.");
   } else {
     const usdAmount = eurAmountNum * EUR_USD_RATE;
@@ -29,8 +30,22 @@ if (menuSelection === "1") {
   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;//3 bug
+    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 if (menuSelection === "1") {
+  // EUR -> USD
+      const eurAmountInput = prompt("Enter amount in EUR: ");
+      const eurAmountNum = Number(eurAmountInput);
+
+  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.`
+    );
   }
 } else {
   console.log("Invalid selection. Please choose either 1 or 2.");