diff --git a/docs/index.md b/docs/index.md
index f6480c9..b5e8b30 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -5,7 +5,7 @@
* This website
* Zoom meeting (through mail)
* Google doc (through mail)
-* [Slack channel](https://join.slack.com/t/ngsvariantana-y1r2970/shared_invite/zt-j9qnpkc7-1se2c_l~mU8A1Pa1PKkHTA)
+* [Slack channel](https://slack.com)
## Learning outcomes
@@ -31,7 +31,7 @@ During lectures, you are encouraged to raise your hand if you have questions (if
-A main source of communication will be our [slack channel](https://join.slack.com/t/ngsvariantana-y1r2970/shared_invite/zt-j9qnpkc7-1se2c_l~mU8A1Pa1PKkHTA). Ask background questions that interest you personally at **#background**. During the exercises, e.g. if you are stuck or don't understand what is going on, use the slack channel **#peer-q-and-a**. This channel is not only meant for asking questions but also for answering questions of other participants. Answer questions only if you have finished the practical block, and use the "reply in thread" option:
+A main source of communication will be our [slack channel](https://slack.com). Ask background questions that interest you personally at **#background**. During the exercises, e.g. if you are stuck or don't understand what is going on, use the slack channel **#q-and-a**. This channel is not only meant for asking questions but also for answering questions of other participants. Answer questions only if you have finished the practical block, and use the "reply in thread" option:
@@ -45,6 +45,6 @@ The teacher will review the answers, and add/modify if necessary. If you're stuc
* Personal interest questions: **#background**
* During exercises:
- * **\#peer_q_and_a** on slack
+ * **\#q-and-a** on slack
* if really stuck: *no* button in zoom
* if finished: *yes* button in zoom
diff --git a/docs/precourse.md b/docs/precourse.md
index 089a0da..876a9fe 100644
--- a/docs/precourse.md
+++ b/docs/precourse.md
@@ -1,7 +1,7 @@
## UNIX
-As is stated in the course prerequisites at the [announcement web page](https://www.sib.swiss/training/course/2020-11-NGS6). We expect participants to have a basic understanding of working with the command line on UNIX-based systems. If you don't have experience with UNIX command line, or if you're unsure whether you meet the prerequisites, follow our [online UNIX tutorial](https://edu.sib.swiss/pluginfile.php/2878/mod_resource/content/4/couselab-html/content.html).
+As is stated in the course prerequisites at the [announcement web page](https://www.sib.swiss/training/course/2021-03-NGS2). We expect participants to have a basic understanding of working with the command line on UNIX-based systems. You can test your UNIX skills with a quiz [here](https://docs.google.com/forms/d/e/1FAIpQLSd2BEWeOKLbIRGBT_aDEGPce1FOaVYBbhBiaqcaHoBKNB27MQ/viewform?usp=sf_link). If you don't have experience with UNIX command line, or if you're unsure whether you meet the prerequisites, follow our [online UNIX tutorial](https://edu.sib.swiss/pluginfile.php/2878/mod_resource/content/4/couselab-html/content.html).
## Software
-A main source of communication will be our [slack channel](https://join.slack.com/t/ngsvariantana-y1r2970/shared_invite/zt-j9qnpkc7-1se2c_l~mU8A1Pa1PKkHTA). Ask background questions that interest you personally at **#background**. During the exercises, e.g. if you are stuck or don't understand what is going on, use the slack channel **#peer-q-and-a**. This channel is not only meant for asking questions but also for answering questions of other participants. Answer questions only if you have finished the practical block, and use the "reply in thread" option:
+A main source of communication will be our [slack channel](https://slack.com). Ask background questions that interest you personally at **#background**. During the exercises, e.g. if you are stuck or don't understand what is going on, use the slack channel **#q-and-a**. This channel is not only meant for asking questions but also for answering questions of other participants. Answer questions only if you have finished the practical block, and use the "reply in thread" option:
@@ -45,6 +45,6 @@ The teacher will review the answers, and add/modify if necessary. If you're stuc
* Personal interest questions: **#background**
* During exercises:
- * **\#peer_q_and_a** on slack
+ * **\#q-and-a** on slack
* if really stuck: *no* button in zoom
* if finished: *yes* button in zoom
diff --git a/docs/precourse.md b/docs/precourse.md
index 089a0da..876a9fe 100644
--- a/docs/precourse.md
+++ b/docs/precourse.md
@@ -1,7 +1,7 @@
## UNIX
-As is stated in the course prerequisites at the [announcement web page](https://www.sib.swiss/training/course/2020-11-NGS6). We expect participants to have a basic understanding of working with the command line on UNIX-based systems. If you don't have experience with UNIX command line, or if you're unsure whether you meet the prerequisites, follow our [online UNIX tutorial](https://edu.sib.swiss/pluginfile.php/2878/mod_resource/content/4/couselab-html/content.html).
+As is stated in the course prerequisites at the [announcement web page](https://www.sib.swiss/training/course/2021-03-NGS2). We expect participants to have a basic understanding of working with the command line on UNIX-based systems. You can test your UNIX skills with a quiz [here](https://docs.google.com/forms/d/e/1FAIpQLSd2BEWeOKLbIRGBT_aDEGPce1FOaVYBbhBiaqcaHoBKNB27MQ/viewform?usp=sf_link). If you don't have experience with UNIX command line, or if you're unsure whether you meet the prerequisites, follow our [online UNIX tutorial](https://edu.sib.swiss/pluginfile.php/2878/mod_resource/content/4/couselab-html/content.html).
## Software