diff --git a/docs/UserGuide.md b/docs/UserGuide.md
index 37c3eb9eaef..b4da62aa93b 100644
--- a/docs/UserGuide.md
+++ b/docs/UserGuide.md
@@ -470,12 +470,12 @@ If your changes to the data file makes its format invalid, AddressBook will disc
* Commands that start with *(M)* could only be accessed from Main Window
* Commands that start with *(T)* could only be accessed from Timetable Window
* Commands that start with *(B)* could be accessed from both Main and Customer Window
+* Commands that start with *(A)* could be accessed from all 3 windows: Main, Customer and Timetable Window.
| Action | Format, Examples |
|-----------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
| ***(C)* Add Customer** | Click on `Customers` in menu bar > `Address Book` then input `add n/NAME p/PHONE_NUMBER e/EMAIL a/ADDRESS [t/TAG]…`
e.g., `add n/James Ho p/22224444 e/jamesho@example.com a/123, Clementi Rd, 1234665 t/friend t/colleague` |
-| ***(B)* Clear all entries** | `clear` |
| ***(C)* Delete Customer** | Click on `Customers` in menu bar > `Address Book` then input `delete INDEX`
e.g., `delete 3` |
| ***(C)* Edit Customer details** | Click on `Customers` in menu bar > `Address Book` then input `edit INDEX [n/NAME] [p/PHONE_NUMBER] [e/EMAIL] [a/ADDRESS] [t/TAG]…`
e.g.,`edit 2 n/James Lee e/jameslee@example.com` |
| ***(C)* Find Customer** | Click on `Customers` in menu bar > `Address Book` then input `find KEYWORD [MORE_KEYWORDS]`
e.g., `find James Jake` |
@@ -495,7 +495,8 @@ If your changes to the data file makes its format invalid, AddressBook will disc
| ***(M)* Show List of Completed Jobs** | `timetable_completed`
OR
Click on `Timetable` in menu bar > `Completed Jobs` |
| ***(M)* Show List of Unscheduled Jobs** | `timetable_unscheduled`
OR
Click on `Timetable` in menu bar > `Unscheduled Jobs` |
| ***(M)* Show Statistics** | `stats`
OR
Click on `Statistics` in menu bar > `Display Statistics` |
-| ***(B)* Help** | `help`
Or
Click on `Help` in menu bar > `Help` |
-| ***(B)* Exit** | `exit`
Or
Click on `Exit` in menu bar > `Exit` |
+| ***(B)* Clear all entries** | `clear` |
+| ***(A)* Help** | `help`
Or
Click on `Help` in menu bar > `Help` |
+| ***(A)* Exit** | `exit`
Or
Click on `Exit` in menu bar > `Exit` |
diff --git a/src/main/java/seedu/address/logic/parser/timetable/TimetableParser.java b/src/main/java/seedu/address/logic/parser/timetable/TimetableParser.java
index 7f9203e0036..db8c963a6c9 100644
--- a/src/main/java/seedu/address/logic/parser/timetable/TimetableParser.java
+++ b/src/main/java/seedu/address/logic/parser/timetable/TimetableParser.java
@@ -7,6 +7,7 @@
import java.util.regex.Pattern;
import seedu.address.logic.commands.Command;
+import seedu.address.logic.commands.ExitCommand;
import seedu.address.logic.commands.HelpCommand;
import seedu.address.logic.commands.timetable.TimetableCompletedCommand;
import seedu.address.logic.commands.timetable.TimetableDateCommand;
@@ -42,6 +43,9 @@ public Command parseCommand(String userInput) throws ParseException {
case HelpCommand.COMMAND_WORD:
return new HelpCommand();
+ case ExitCommand.COMMAND_WORD:
+ return new ExitCommand();
+
case TimetableDateCommand.COMMAND_WORD:
return new TimetableDateCommandParser().parse(arguments);