diff --git a/docs/content/docs/features/CampusManagementSystems.md b/docs/content/docs/features/CampusManagementSystems.md
index 4d5d561d4..83bc63119 100644
--- a/docs/content/docs/features/CampusManagementSystems.md
+++ b/docs/content/docs/features/CampusManagementSystems.md
@@ -1,6 +1,6 @@
 ---
 title: "Connect Campus Management Systems"
-draft: false
+draft: true
 weight: 50
 ---
 
diff --git a/docs/content/docs/features/Communication.md b/docs/content/docs/features/Communication.md
index eb066ed1c..68f197844 100644
--- a/docs/content/docs/features/Communication.md
+++ b/docs/content/docs/features/Communication.md
@@ -1,6 +1,6 @@
 ---
 title: "Communication"
-draft: false
+draft: true
 weight: 30
 ---
 
diff --git a/docs/content/docs/features/LectureHallStreams.md b/docs/content/docs/features/LectureHallStreams.md
index 05ecda0a0..45f498bb1 100644
--- a/docs/content/docs/features/LectureHallStreams.md
+++ b/docs/content/docs/features/LectureHallStreams.md
@@ -6,6 +6,17 @@ weight: 10
 
 # Automatic Broadcasting and Recording of Auditoriums
 
+With gocast, you can easily stream your lectures to the internet. This allows students to follow the lecture from home
+or on the go. If you wish so, recording of the lecture is also available for later viewing.
+
+For this purpose, we have installed Streaming Media Processors (SMPs) in many lecture halls at TUM. These devices are
+capable of capturing the video and audio of the lecture and sending it to our servers for broadcasting.
+
+For a guide on how to stream from a lecture hall, please refer to the [Lecture Hall Streaming Guide]({{<ref 01-lecturehall-streaming.md>}}).
+
 ---
 
 # Self-Streaming using OBS, Zoom or other Software
+You can also stream your lectures yourself with any streaming software you like. We recommend OBS for this purpose.
+
+For instructions on how to self-stream, please refer to the [Self-Streaming Guide]({{<ref 02-self-streaming.md>}}).
diff --git a/docs/content/docs/usage/01-lecturehall-streaming.md b/docs/content/docs/usage/01-lecturehall-streaming.md
new file mode 100644
index 000000000..87fa9b2b8
--- /dev/null
+++ b/docs/content/docs/usage/01-lecturehall-streaming.md
@@ -0,0 +1,36 @@
+---
+title: "Lecture Hall Streaming"
+draft: false
+weight: 10
+---
+
+## Streaming from a lecture hall with installed SMPs
+
+This guide contains information on how to stream from a lecture hall at TUM.
+
+
+### Gather streaming key.
+
+- Open the courses admin page
+- Create a stream with the location "self stream" if it doesn't exist already.
+- Navigate to the stream and click `show keys`.
+
+### OBS
+
+- Download and install OBS from [here](https://obsproject.com/).
+- Open OBS and click on `Settings` in the bottom right corner.
+- Click on `Stream` in the left sidebar.
+- Select `Custom` from the dropdown menu.
+- Paste the stream key and the stream server from the courses admin page into the `Stream key` and `Stream server` field.
+- Click on `Output` in the left sidebar.
+- Click on `Streaming` in the top menu.
+- Select `Simple` from the `Output Mode` dropdown menu.
+- Insert the following settings:
+    - Video Bitrate: 2500 - 4000
+    - Audio Bitrate: 192 kbp/s (or 128kbp/s)
+    - Video Encoder: x264
+- Please ensure that your output is scaled to 1920x1080.
+
+#### Zoom
+
+To use zoom for streaming, login to your account, navigate to... Click...
\ No newline at end of file
diff --git a/docs/content/docs/usage/01-self-streaming.md b/docs/content/docs/usage/01-self-streaming.md
deleted file mode 100644
index f4834cec1..000000000
--- a/docs/content/docs/usage/01-self-streaming.md
+++ /dev/null
@@ -1,22 +0,0 @@
----
-title: "Self Streaming"
-draft: false
-weight: 10
----
-
-## Self Streaming
-
-This guide contains information on how to stream from your own computer.
-
-
-### Gather streaming key.
-
-- Open the courses admin page
-- Create a stream with the location "self stream" if it doesn't exist already.
-- Navigate to the stream and click `show keys`.
-
-#### OBS
-
-#### Zoom
-
-To use zoom for streaming, login to your account, navigate to... Click...
\ No newline at end of file
diff --git a/docs/content/docs/usage/02-self-streaming.md b/docs/content/docs/usage/02-self-streaming.md
new file mode 100644
index 000000000..367c05e9d
--- /dev/null
+++ b/docs/content/docs/usage/02-self-streaming.md
@@ -0,0 +1,36 @@
+---
+title: "Self Streaming"
+draft: false
+weight: 10
+---
+
+## Self Streaming
+
+This guide contains information on how to stream from your own computer.
+
+
+### Gather streaming key.
+
+- Open the courses admin page
+- Create a stream with the location "self stream" if it doesn't exist already.
+- Navigate to the stream and click `show keys`.
+
+### OBS
+
+- Download and install OBS from [here](https://obsproject.com/).
+- Open OBS and click on `Settings` in the bottom right corner.
+- Click on `Stream` in the left sidebar.
+- Select `Custom` from the dropdown menu.
+- Paste the stream key and the stream server from the courses admin page into the `Stream key` and `Stream server` field.
+- Click on `Output` in the left sidebar.
+- Click on `Streaming` in the top menu.
+- Select `Simple` from the `Output Mode` dropdown menu.
+- Insert the following settings:
+  - Video Bitrate: 2500 - 4000
+  - Audio Bitrate: 192 kbp/s (or 128kbp/s)
+  - Video Encoder: x264
+- Please ensure that your output is scaled to 1920x1080.
+
+#### Zoom
+
+To use zoom for streaming, login to your account, navigate to... Click...
\ No newline at end of file