diff --git a/format-clock-edge-cases/README.md b/format-clock-edge-cases/README.md
index 8a43a9e964..1acca0972b 100644
--- a/format-clock-edge-cases/README.md
+++ b/format-clock-edge-cases/README.md
@@ -13,3 +13,4 @@ function formatAs12HourClock(time) {
 ```
 
 It still has bugs. Think of as many edge-cases as you can with this code. Write tests for all of them, and fix this code so that it works correctly for all valid inputs. You don't need to worry about invalid inputs (e.g. `"25:00"`).
+
diff --git a/format-clock-edge-cases/timeConverter.js b/format-clock-edge-cases/timeConverter.js
index 310c07bd9c..f4216dbfe7 100644
--- a/format-clock-edge-cases/timeConverter.js
+++ b/format-clock-edge-cases/timeConverter.js
@@ -1,11 +1,25 @@
 function formatAs12HourClock(time) {
-
   const hours = Number(time.slice(0, 2));
+  const minutes = time.slice(3, 5);
 
   if (hours > 12) {
-    return `${hours - 12}:00 pm`;
+    const convertedHours = hours - 12;
+    // Add leading zero if convertedHours is a single digit
+    const formattedHours =
+      convertedHours < 10 ? `0${convertedHours}` : `${convertedHours}`;
+    return `${formattedHours}:${minutes} pm`;
+  }
+  //handling noon.
+  if (hours === 12) {
+    return `12:${minutes} pm`;
+  }
+
+  //handling midnight
+  if (hours === 0) {
+    return `12:${minutes} am`;
   }
+  //handling morning times
   return `${time} am`;
 }
 
-export {formatAs12HourClock};
+export { formatAs12HourClock };
diff --git a/format-clock-edge-cases/timeConverter.test.js b/format-clock-edge-cases/timeConverter.test.js
index 88f2af0948..cde917ab6c 100644
--- a/format-clock-edge-cases/timeConverter.test.js
+++ b/format-clock-edge-cases/timeConverter.test.js
@@ -1,11 +1,35 @@
-import {formatAs12HourClock} from "./timeConverter.js";
+import { formatAs12HourClock } from "./timeConverter.js";
 import assert from "node:assert";
 import test from "node:test";
 
-test("correctly convert time after 12:00", function(){
-    assert.equal(formatAs12HourClock("23:00"), "11:00 pm");
+test("correctly convert time after 12:00", function () {
+  assert.equal(formatAs12HourClock("23:00"), "11:00 pm");
 });
 
-test("can correctly convert morning time", function() {
-    assert.equal(formatAs12HourClock("08:00"), "08:00 am");
+test("can correctly convert morning time", function () {
+  assert.equal(formatAs12HourClock("08:00"), "08:00 am");
+});
+
+test("correctly convert midnight", function () {
+  assert.equal(formatAs12HourClock("00:00"), "12:00 am");
+});
+
+test("correctly convert noon", function () {
+  assert.equal(formatAs12HourClock("12:00"), "12:00 pm");
+});
+
+test("correctly convert single digit hour in the morning", function () {
+  assert.equal(formatAs12HourClock("01:30"), "01:30 am");
+});
+
+test("correctly convert single digit hour in the afternoon", function () {
+  assert.equal(formatAs12HourClock("13:45"), "01:45 pm");
+});
+
+test("correctly convert time with leading zeros", function () {
+  assert.equal(formatAs12HourClock("09:05"), "09:05 am");
+});
+
+test("correctly convert double digit hour in the afternoon", function () {
+  assert.equal(formatAs12HourClock("15:20"), "03:20 pm");
 });