diff --git a/docs/guide/TNGFUE/AP1.png b/docs/guide/TNGF/AP1.png
similarity index 100%
rename from docs/guide/TNGFUE/AP1.png
rename to docs/guide/TNGF/AP1.png
diff --git a/docs/guide/TNGFUE/AP2.png b/docs/guide/TNGF/AP2.png
similarity index 100%
rename from docs/guide/TNGFUE/AP2.png
rename to docs/guide/TNGF/AP2.png
diff --git a/docs/guide/TNGFUE/AP3.png b/docs/guide/TNGF/AP3.png
similarity index 100%
rename from docs/guide/TNGFUE/AP3.png
rename to docs/guide/TNGF/AP3.png
diff --git a/docs/guide/TNGF/AP_info.png b/docs/guide/TNGF/AP_info.png
new file mode 100644
index 00000000..463d566b
Binary files /dev/null and b/docs/guide/TNGF/AP_info.png differ
diff --git a/docs/guide/TNGFUE/interfaces.png b/docs/guide/TNGF/interfaces.png
similarity index 100%
rename from docs/guide/TNGFUE/interfaces.png
rename to docs/guide/TNGF/interfaces.png
diff --git a/docs/guide/TNGF/ping.png b/docs/guide/TNGF/ping.png
new file mode 100644
index 00000000..d22300cf
Binary files /dev/null and b/docs/guide/TNGF/ping.png differ
diff --git a/docs/guide/TNGFUE/subscribe.png b/docs/guide/TNGF/subscribe.png
similarity index 100%
rename from docs/guide/TNGFUE/subscribe.png
rename to docs/guide/TNGF/subscribe.png
diff --git a/docs/guide/tngfue-installation.md b/docs/guide/TNGF/tngfue-installation.md
similarity index 89%
rename from docs/guide/tngfue-installation.md
rename to docs/guide/TNGF/tngfue-installation.md
index 6175a79e..e9150549 100644
--- a/docs/guide/tngfue-installation.md
+++ b/docs/guide/TNGF/tngfue-installation.md
@@ -12,39 +12,43 @@ Modify `~/free5gc/config/tngfcfg.yaml` file
 ```yaml
 # --- Bind Interfaces ---
 IKEBindAddress: <YOUR_FREE5GC_IP> # IP address of Nwu interface (IKE) on this TNGF
-RadiusBindAddress: <YOUR_FREE5GC_IP> #192.168.137.103 # IP address of Nwu interface (IKE) on this TNGF
+RadiusBindAddress: <YOUR_FREE5GC_IP> # IP address of Nwu interface (IKE) on this TNGF
 ```
 
 ## 2. Use WebConsole to Add UE
 * Start your webconsole server
-    ```
+    ```sh
     cd ~/free5gc/webconsole/
+    make # If webconsole haven't compile in previous step
     ./bin/webconsole
     ```
 * Open your web browser from your host machine, and enter the URL `http://<FREE5GC_IP>:5000`
 * On the login page, enter username `admin` and password `free5gc`
 * Go to `SUBSCRIBERS` and click on `CREATE`
 * Check `SUPI(IMSI)` field is unique and modify other fields whatever you need
-![image](./TNGFUE/subscribe.png)
+![subscribe](./subscribe.png)
 * Scroll all the way down and click on `CREATE`.
 
 ## 3. AP setting
 
+#### AP information
+![APinformation](./AP_info.png)
+
 #### Setting ESSID
 > **Network → Wireless → Edit → Interface Configuration → General Setup**
-> ![image](./TNGFUE/AP1.png)
+> ![AP1](./AP1.png)
 
 #### Setting as below, RADIUS Authentication Server is free5gc IP
 > **Interface Configuration → Wireless Security**
-> ![image](./TNGFUE/AP2.png)
+> ![AP2](./AP2.png)
 > 
 
 #### Open Dynamic DHCP
 > **Network → Interface → Edit lan →  DHCP server → Advance Setting**
-> ![image](./TNGFUE/AP3.png)
+> ![AP3](./AP3.png)
 
 ## 4. TNGFUE Installation
-Install TNGFUE in another wireless device.
+Install TNGFUE in another device with WIFI connectivity.
 ### Get Source Code
 ```
 git clone https://github.com/free5gc/tngfue.git
@@ -110,12 +114,8 @@ In ```tngfue/wpa_supplicant/sec.conf```:
 
 You can find all the parameters listed below on the Web Console subscriber page.
 
-- `K:` 
 - `imsi_identity:` SUPI(IMSI)
 - `MSIN:` SUPI without the PLMN part
-- `SQN:`
-- `AMF:` Authentication Management Field
-- `OPC:` Operator Code Value
 
 Format: 
 ```
@@ -196,15 +196,19 @@ ip r add default via 192.168.1.202 dev <YOUR_WIFI_INTERFACE_NAME>
 #### Run
 ```
 cd ~/tngfue/wpa_supplicant
-sudo ./wpa_supplicant -c ../wpa_supplicant.conf -i <YOUR_WIFI_INTERFACE_NAME> -dd
+sudo ./wpa_supplicant -c ../wpa_supplicant.conf -i <YOUR_WIFI_INTERFACE_NAME>
 ```
 
 When the session connects successfully, you will see these five interfaces established. 
-![image](./TNGFUE/interfaces.png)
+![interfaces](./interfaces.png)
 
+And TNGFUE will show that connection is completed.
+![tngfue1](./tngfue1.png)
+![tngfue2](./tngfue2.png)
 
 ### C. Transfer data over the greTun0 interface
 
 ```
 ping -I greTun0 8.8.8.8
 ```
+![ping](./ping.png)
diff --git a/docs/guide/TNGF/tngfue1.png b/docs/guide/TNGF/tngfue1.png
new file mode 100644
index 00000000..6c932f5d
Binary files /dev/null and b/docs/guide/TNGF/tngfue1.png differ
diff --git a/docs/guide/TNGF/tngfue2.png b/docs/guide/TNGF/tngfue2.png
new file mode 100644
index 00000000..74e9fcc5
Binary files /dev/null and b/docs/guide/TNGF/tngfue2.png differ
diff --git a/docs/guide/index.md b/docs/guide/index.md
index 5a560636..da52fded 100644
--- a/docs/guide/index.md
+++ b/docs/guide/index.md
@@ -43,7 +43,7 @@ For people who are not familiar with virtual machines and Linux installation, he
 - [Build and Install free5GC](./3-install-free5gc.md) from source code and [Test](./4-test-free5gc.md) free5GC
 - [Installing a UE/RAN Simulator](./5-install-ueransim.md)
 - [Installing a N3IWUE](./n3iwue-installation.md)
-- [Installing a TNGFUE](./tngfue-installation.md)
+- [Installing a TNGFUE](./TNGF/tngfue-installation.md)
 - [Enable OAuth2 on SBI](./OAuth2/oauth2_enable.md)
 - [free5GC Simple Apps](./6-simple-app.md)
 - All of tutorial videos are available at our YouTube channel: