diff --git a/.idea/misc.xml b/.idea/misc.xml
index 3184161..dcf2745 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -33,4 +33,9 @@
   <component name="ProjectRootManager" version="2" languageLevel="JDK_17" project-jdk-name="17" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
+  <component name="SwUserDefinedSpecifications">
+    <option name="specTypeByUrl">
+      <map />
+    </option>
+  </component>
 </project>
\ No newline at end of file
diff --git a/data/csv/BoardingPass.csv b/data/csv/BoardingPass.csv
index 47c577a..7288a09 100644
--- a/data/csv/BoardingPass.csv
+++ b/data/csv/BoardingPass.csv
@@ -1,3 +1,6 @@
 passenger,flight,seatNo,food
 123456,MH1234,1A,VEGETARIAN
 123456,MH8633,1B,VEGETARIAN
+123456,MH1234,17B,VEGETARIAN
+123456,MH8633,4E,STANDARD
+123456,MH1234,5E,STANDARD
diff --git a/data/csv/Reservation.csv b/data/csv/Reservation.csv
index 313fddd..c2a321b 100644
--- a/data/csv/Reservation.csv
+++ b/data/csv/Reservation.csv
@@ -17,5 +17,5 @@ reservationId,passenger,flight,seatLevel,mealsAvailable,handBaggageNum,checkedBa
 1522521654113210368,450101197405207446,HH6324,ECONOMY_CLASS,true,1,0,false
 1522522483536826368,654022197901228286,GH0001,FIRST_CLASS,true,0,1,false
 1522522709437845504,152224198908049211,CH2341,FIRST_CLASS,true,1,1,false
-1517540042405449728,123456,MH1234,ECONOMY_CLASS,true,1,0,true
 1517540128904248799,123456,MH8633,BUSINESS_CLASS,true,0,1,true
+1517540042405449728,123456,MH1234,ECONOMY_CLASS,true,1,0,true
diff --git a/data/csv/flightSeat/MH1234_2022-05-25.csv b/data/csv/flightSeat/MH1234_2022-05-25.csv
index a56db45..b77e04e 100644
--- a/data/csv/flightSeat/MH1234_2022-05-25.csv
+++ b/data/csv/flightSeat/MH1234_2022-05-25.csv
@@ -3,6 +3,7 @@ false,true,true,true,true,true
 true,true,true,true,true,true
 true,true,true,true,true,true
 true,true,true,true,true,true
+true,true,true,true,false,true
 true,true,true,true,true,true
 true,true,true,true,true,true
 true,true,true,true,true,true
@@ -14,8 +15,7 @@ true,true,true,true,true,true
 true,true,true,true,true,true
 true,true,true,true,true,true
 true,true,true,true,true,true
-true,true,true,true,true,true
-true,true,true,true,true,true
+true,false,true,true,true,true
 true,true,true,true,true,true
 true,true,true,true,true,true
 true,true,true,true,true,true
diff --git a/data/csv/flightSeat/MH8633_2022-09-11.csv b/data/csv/flightSeat/MH8633_2022-09-11.csv
index 5889e5e..79392ab 100644
--- a/data/csv/flightSeat/MH8633_2022-09-11.csv
+++ b/data/csv/flightSeat/MH8633_2022-09-11.csv
@@ -2,7 +2,7 @@ A,B,C,D,E,F
 false,false,true,true,true,true
 true,true,true,true,true,true
 true,true,true,true,true,true
-true,true,true,true,true,true
+true,true,true,true,false,true
 true,true,true,true,true,true
 true,true,true,true,true,true
 true,true,true,true,true,true
diff --git a/data/json/BoardingPass.json b/data/json/BoardingPass.json
index bca5dc8..fa56b13 100644
--- a/data/json/BoardingPass.json
+++ b/data/json/BoardingPass.json
@@ -3,21 +3,21 @@
     "passengerId": "123456",
     "firstName": "Jun",
     "lastName": "Test",
-    "age": 21,
-    "telephone": "131043688481234"
+    "age": 20,
+    "telephone": "13104368848"
   },
   "flight": {
-    "flightId": "MH1111",
+    "flightId": "MH1234",
     "departure": "Beijing",
-    "destination": "Hainan",
-    "boardingGate": "C08",
-    "boardingTime": "2022-09-11 07:05",
-    "departureTime": "2022-09-11 09:55",
-    "arrivalTime": "2022-09-11 12:55"
+    "destination": "Shanghai",
+    "boardingGate": "A10",
+    "boardingTime": "2022-05-25 11:25",
+    "departureTime": "2022-05-25 11:55",
+    "arrivalTime": "2022-05-25 14:55"
   },
-  "seatNo": "1B",
+  "seatNo": "5E",
   "food": {
-    "foodName": "VEGETARIAN",
-    "foodPrice": 20.0
+    "foodName": "STANDARD",
+    "foodPrice": 30.0
   }
 }
\ No newline at end of file
diff --git a/data/json/Flight.json b/data/json/Flight.json
index 5e595fe..8130683 100644
--- a/data/json/Flight.json
+++ b/data/json/Flight.json
@@ -1,9 +1,9 @@
 {
-  "flightId": "MH8638",
+  "flightId": "MH1234",
   "departure": "Beijing",
-  "destination": "Hainan",
-  "boardingGate": "B08",
-  "boardingTime": "2022-09-11 07:05",
-  "departureTime": "2022-09-11 09:55",
-  "arrivalTime": "2022-09-11 12:55"
+  "destination": "Shanghai",
+  "boardingGate": "A10",
+  "boardingTime": "2022-05-25 11:25",
+  "departureTime": "2022-05-25 11:55",
+  "arrivalTime": "2022-05-25 14:55"
 }
\ No newline at end of file
diff --git a/data/json/Food.json b/data/json/Food.json
index c22fd79..a881edf 100644
--- a/data/json/Food.json
+++ b/data/json/Food.json
@@ -1,4 +1,4 @@
 {
-  "foodName": "VEGETARIAN",
-  "foodPrice": 20.0
+  "foodName": "STANDARD",
+  "foodPrice": 30.0
 }
\ No newline at end of file
diff --git a/data/json/Reservation.json b/data/json/Reservation.json
index caafa38..a8e37c0 100644
--- a/data/json/Reservation.json
+++ b/data/json/Reservation.json
@@ -1,19 +1,26 @@
 [
 	{
-      "reservationId": "1511111111111111111",
+      "reservationId": "1517540042405449728",
+      "passenger": {
+        "passengerId": "123456",
+        "firstName": "Jun",
+        "lastName": "Test",
+        "age": 20,
+        "telephone": "13104368848"
+      },
       "flight": {
-        "flightId": "MH1111",
+        "flightId": "MH1234",
         "departure": "Beijing",
-        "destination": "Hainan",
-        "boardingGate": "C08",
-        "boardingTime": "2022-09-11 07:05",
-        "departureTime": "2022-09-11 09:55",
-        "arrivalTime": "2022-09-11 12:55"
+        "destination": "Shanghai",
+        "boardingGate": "A10",
+        "boardingTime": "2022-05-25 11:25",
+        "departureTime": "2022-05-25 11:55",
+        "arrivalTime": "2022-05-25 14:55"
       },
-      "seatLevel": "FIRST_CLASS",
+      "seatLevel": "ECONOMY_CLASS",
       "mealsAvailable": true,
-      "handBaggageNum": 0,
-      "checkedBaggageNum": 1,
+      "handBaggageNum": 1,
+      "checkedBaggageNum": 0,
       "checked": false
     }
 ]
\ No newline at end of file
diff --git a/data/json/Seat.json b/data/json/Seat.json
index ee9dc26..5cbda8d 100644
--- a/data/json/Seat.json
+++ b/data/json/Seat.json
@@ -1,6 +1,6 @@
 {
-  "flightId": "MH8633",
-  "column": "B",
-  "row": "1",
-  "price": "400.0"
+  "flightId": "MH1234",
+  "column": "E",
+  "row": "5",
+  "price": "200.0"
 }
\ No newline at end of file
diff --git a/data/json/Type.json b/data/json/Type.json
index 39ce37b..e7597bf 100644
--- a/data/json/Type.json
+++ b/data/json/Type.json
@@ -1,3 +1,3 @@
 {
-	"type": "id"
+	"type": "alipay"
 }
\ No newline at end of file
diff --git a/data/printer/BoardingPass.txt b/data/printer/BoardingPass.txt
index c0a0155..337761f 100644
--- a/data/printer/BoardingPass.txt
+++ b/data/printer/BoardingPass.txt
@@ -2,13 +2,13 @@
  / \                            \.
 |   |                           |.
  \__|                           |.
-    |  DATE: 11 SEPTEMBER       |.
-    |  FLIGHT: MH8633           |.
-    |  NAME: Test Jun           |.
-    |  SEAT: 1B                 |.
-    |  GATE: B08                |.
-    |  BD TIME: 07:05           |.
-    |  DEST: Hainan             |.
+    |  DATE: 25 MAY             |.
+    |  FLIGHT: MH1234           |.
+    |  NAME: Jun Test           |.
+    |  SEAT: 5E                 |.
+    |  GATE: A10                |.
+    |  BD TIME: 11:25           |.
+    |  DEST: Shanghai           |.
     |                           |.
     |                           |.
     |   ________________________|____
diff --git a/data/printer/Tag.txt b/data/printer/Tag.txt
index d71a412..cd2d952 100644
--- a/data/printer/Tag.txt
+++ b/data/printer/Tag.txt
@@ -1,15 +1 @@
-You don't have hand baggage
-
-_______________________________________
-
-   ___________VOUCHER___________
- / \                            \.
-|   |                           |.
- \__|                           |.
-    |  NO.1                     |.
-    |  COUNTER: B08             |.
-    |  CHECKED BAGGAGE: 1       |.
-    |                           |.
-    |   ________________________|____
-    |  /                            /.
-    \_/Group58_____________________/.
\ No newline at end of file
+You don't have checked baggage
\ No newline at end of file
diff --git a/src/main/java/com/app/flight/controller/AdminLoginController.java b/src/main/java/com/app/flight/controller/AdminLoginController.java
index c8f113b..a0db951 100644
--- a/src/main/java/com/app/flight/controller/AdminLoginController.java
+++ b/src/main/java/com/app/flight/controller/AdminLoginController.java
@@ -19,6 +19,7 @@
  * This code is used to finish all the steps of check-in.
  *
  * @author Huanghong
+ * @author zhenghan
  * @version 2.1
  * @date 2022.3.30
  */
@@ -91,6 +92,11 @@ public void start(Stage stage) throws IOException {
         stage.show();
     }
 
+    /**
+     * This method is used to get the loader of SelectLanguage.fxml.
+     *
+     * @throws IOException IOException
+     */
     public FXMLLoader getLoader() throws IOException {
         return new FXMLLoader(Main.class.getResource("fxml/AdminLogin.fxml"));
     }
diff --git a/src/main/java/com/app/flight/controller/AdminViewController.java b/src/main/java/com/app/flight/controller/AdminViewController.java
index b5df39d..c1ba1b3 100644
--- a/src/main/java/com/app/flight/controller/AdminViewController.java
+++ b/src/main/java/com/app/flight/controller/AdminViewController.java
@@ -18,6 +18,8 @@
 import java.util.ArrayList;
 
 /**
+ * The controller for admin viewing the checking information
+ *
  * @author Zheng Han
  * @version 2.1
  */
diff --git a/src/main/java/com/app/flight/controller/ScanInstructionController.java b/src/main/java/com/app/flight/controller/ScanInstructionController.java
index 3571da7..e0bbd0e 100644
--- a/src/main/java/com/app/flight/controller/ScanInstructionController.java
+++ b/src/main/java/com/app/flight/controller/ScanInstructionController.java
@@ -19,7 +19,10 @@
 
 
 /**
+ * Help passengers to use the scanning feature
+ *
  * @author LianJunhong
+ * @author zhenghan
  */
 public class ScanInstructionController {
     @FXML
@@ -41,7 +44,6 @@ public FXMLLoader getLoader() {
      *
      * @param idNumber
      * @param stage
-     * @throws IOException
      */
     public void checkIdNumber(String idNumber, Stage stage) {
         if (isValidCard(idNumber) || idNumber.equals("123456")) {
@@ -74,8 +76,7 @@ public void checkIdNumber(String idNumber, Stage stage) {
     /**
      * This method is used to get the help page.
      *
-     * @param actionEvent
-     * @throws IOException
+     * @param actionEvent actionEvent
      */
     public void helpClick(ActionEvent actionEvent) {
         Platform.runLater(() -> {
@@ -95,8 +96,7 @@ public void helpClick(ActionEvent actionEvent) {
     /**
      * This method is used to return to the previous page.
      *
-     * @param actionEvent
-     * @throws IOException
+     * @param actionEvent actionEvent
      */
     public void back(ActionEvent actionEvent) {
         Platform.runLater(() -> {
diff --git a/src/main/resources/com/app/flight/image/QR_Code/BoardingPassQR.jpg b/src/main/resources/com/app/flight/image/QR_Code/BoardingPassQR.jpg
index cdaa068..26b5ec6 100644
Binary files a/src/main/resources/com/app/flight/image/QR_Code/BoardingPassQR.jpg and b/src/main/resources/com/app/flight/image/QR_Code/BoardingPassQR.jpg differ
diff --git a/src/main/resources/com/app/flight/image/QR_Code/TagQR.jpg b/src/main/resources/com/app/flight/image/QR_Code/TagQR.jpg
index ad0faf6..cb2b5c9 100644
Binary files a/src/main/resources/com/app/flight/image/QR_Code/TagQR.jpg and b/src/main/resources/com/app/flight/image/QR_Code/TagQR.jpg differ