diff --git a/doc/BUILD.md b/doc/BUILD.md
index a9e6a19571d28a6e1b59c44af08d1f4d5de2afef..6d3645948f1bc415011df6436da59fd4bdea79fb 100644
--- a/doc/BUILD.md
+++ b/doc/BUILD.md
@@ -113,3 +113,9 @@ After completing the build, the binaries are available in the `cmake_targets/lte
 | --rfsimulator                                               | maintained                                  | builds the rf simulator device. Now of little interest as this device build is enforced when building the eNodeB and it can be used at run time with the `--rfsim` option. |
 |                                                             |                                             |                                                              |
 
+[oai wiki home](https://gitlab.eurecom.fr/oai/openairinterface5g/wikis/home)
+
+[oai softmodem features](FEATURE_SET.md)
+
+[running the oai softmodem ](RUNMODEM.md)
+
diff --git a/doc/FEATURE_SET.md b/doc/FEATURE_SET.md
index 29163fd83208a670cb466769430d9257990181e1..1e8e2840c016811ee082b6688a2e6dfc9af9e513 100644
--- a/doc/FEATURE_SET.md
+++ b/doc/FEATURE_SET.md
@@ -192,3 +192,10 @@ The NAS layer is based on **3GPP 24.301** and implements the following functions
 
 - EMM attach/detach, authentication, tracking area update, and more
 - ESM default/dedicated bearer, PDN connectivity, and more
+
+[oai wiki home](https://gitlab.eurecom.fr/oai/openairinterface5g/wikis/home)
+
+[oai softmodem build procedure](BUILD.md)
+
+[running the oai softmodem ](RUNMODEM.md)
+
diff --git a/doc/RUNMODEM.md b/doc/RUNMODEM.md
index 37b25522337c62873e523a1d549f1d08c6505ba6..b86546368cb9dead5808b3ff59843f92640d014c 100644
--- a/doc/RUNMODEM.md
+++ b/doc/RUNMODEM.md
@@ -10,15 +10,35 @@ It is planned to enhance this simulator with the following functionalities:
 
 - Support for multiple UE connections
 - Support for multiple eNodeB for hand-over tests
-- Spport for channel modeling
+- Support for channel modeling
 
    This is an easy use-case to setup and test, as no specific hardware is required. The [rfsimulator page](../targets/ARCH/rfsimulator/README.md ) contains the detailed documentation.
 
 ## l2 nfapi simulator
 
+This simulator connects a eNodeB and UEs through the nfapi interface. 
+
   As for the rf simulator, no specific hardware is required. The [L2 nfapi simlator page](https://gitlab.eurecom.fr/oai/openairinterface5g/wikis/l2-nfapi-simulator/l2-nfapi-simulator-w-S1-same-machine) contains the detailed documentation.
 
+## l1 simulator
+
+The [L1 simulator page](https://gitlab.eurecom.fr/oai/openairinterface5g/wikis/OpenAirLTEEmulationNEW) contains the detailed documentation.
+
+## USRP record player
+
+## noS1 mode
+
+The noS1 mode is now available via the `--noS1`command line option. It can be used with simulators, described above, or when using oai with true RF boards. Only the oai UE can be connected to the oai eNodeB in noS1 mode.
+
+By default the noS1 mode is using linux tun interfaces to send or receive ip packets to/from the linux ip stack. using the `--nokrnmod 0`option you can enforce kernel modules instead of tun.
+
+noS1 code has been revisited, it has been tested with the rf simulator, and tun interfaces. More tests are on going and CI will soon include noS1 tests.
+
 ## Monolithic eNodeB with USRP radio head
 
-1. ##  
+[oai wiki home](https://gitlab.eurecom.fr/oai/openairinterface5g/wikis/home)
+
+[oai softmodem features](FEATURE_SET.md)
+
+[oai softmodem build procedure](BUILD.md)