diff --git a/exercises/ex1.cpp b/exercises/ex1.cpp
index 22069589..53c7c692 100644
--- a/exercises/ex1.cpp
+++ b/exercises/ex1.cpp
@@ -7,42 +7,40 @@ int main()
 {
   int week;
 
-  /* Input week number from user */
-  cout << "Enter week number(1-7): " << endl;
-  cin >> week;
+  do{
+    /* Input week number from user */
+    cout << "Enter week number(1-7): " << endl;
+    cin >> week;
 
-  if (week == 1)
-  {
-    cout << "Monday" << endl;
-  }
-  else if (week == 2)
-  {
-    cout << "Tuesday" << endl;
-  }
-  else if (week == 3)
-  {
-    cout << "Wednesday" << endl;
-  }
-  else if (week == 4)
-  {
-    cout << "Thursday" << endl;
-  }
-  else if (week == 5)
-  {
-    cout << "Friday" << endl;
-  }
-  else if (week == 6)
-  {
-    cout << "Saturday" << endl;
-  }
-  else if (week == 7)
-  {
-    cout << "Sunday" << endl;
-  }
-  else
-  {
-    cout << "Invalid input! Please enter week number between 1-7." << endl;
-  }
+    switch (week) {
+
+      case 1:
+        cout << "Monday";
+        break;
+      case 2:
+        cout << "Tuesday";
+        break;
+      case 3:
+        cout << "Tuesday";
+        break;
+      case 4:
+        cout << "Thursday";
+        break;
+      case 5:
+        cout << "Friday";
+        break;
+      case 6:
+        cout << "Saturday";
+        break;
+      case 7:
+        cout << "Sunday";
+        break;
+      default:
+        cout << "----------------------------\nInvalid input, please retry!";
+
+    }
+    cout << endl;
+  } while(week > 7 || week < 1);
 
   return 0;
 }
\ No newline at end of file
diff --git a/exercises/ex2.cpp b/exercises/ex2.cpp
index 9e8cd8e4..b2eb8ec5 100644
--- a/exercises/ex2.cpp
+++ b/exercises/ex2.cpp
@@ -10,42 +10,15 @@ using namespace std;
 int main()
 {
   int week;
-
-  cout << "Enter week number(1-7): " << endl;
-  cin >> week;
-
-  if (week == 1)
-  {
-    cout << "Monday" << endl;
-  }
-  else if (week == 2)
-  {
-    cout << "Tuesday" << endl;
-  }
-  else if (week == 3)
-  {
-    cout << "Wednesday" << endl;
-  }
-  else if (week == 4)
-  {
-    cout << "Thursday" << endl;
-  }
-  else if (week == 5)
-  {
-    cout << "Friday" << endl;
-  }
-  else if (week == 6)
-  {
-    cout << "Saturday" << endl;
-  }
-  else if (week == 7)
-  {
-    cout << "Sunday" << endl;
-  }
-  else
-  {
-    cout << "Invalid input! Please enter week number between 1-7." << endl;
-  }
-
+  do{
+    cout << "Enter week number(1-7): " << endl;
+    cin >> week;
+      if (week > 7 || week < 1){
+        cout << "Invalid input! Please enter week number between 1-7." << endl;
+      }
+  } while(week > 7 || week < 1);
+  week--;
+  string arr[7]={"Monday","Tuesday","Wednesday","Thursday","Friday","Saturday","Sunday"};
+  cout << arr[week]<< endl;
   return 0;
 }
\ No newline at end of file