diff --git a/0.Getting-the-training-material.md b/0.Getting-the-training-material.md
index 67b7624..271935e 100644
--- a/0.Getting-the-training-material.md
+++ b/0.Getting-the-training-material.md
@@ -4,14 +4,14 @@ The training material can be obtained by using one of the following methods:
 
 ## Users of SNS analysis cluster
 
-Open a terminal and type the following commad
+Open a terminal and type the following command
 ```
 $ cp -a ~lj7/simulations/notebooks/mcvine-training training
 ```
 
 ## Any MCViNE user
 
-Open a terminal and type the following commad
+Open a terminal and type the following command
 to check it out from git
 
 ```
diff --git a/1.Setup.md b/1.Setup.md
index 8c8c6a7..2721584 100644
--- a/1.Setup.md
+++ b/1.Setup.md
@@ -10,23 +10,9 @@ $ source activate mcvine
 ## General MCViNE users
 
 * Install [miniconda](http://conda.pydata.org/miniconda.html)
-* Create an environment for mcvine
+* Create an environment for mcvine, then activate it.
 
 ```
-$ conda create -n mcvine python
-```
-* Enter the mcvine environment
-
-```
-$ source activate mcvine
-```
-
-* Install mcvine, mantid, and jupyter
-
-```
-$ conda config --add channels conda-forge
-$ conda config --add channels diffpy
-$ conda config --add channels mantid
-$ conda install -c mcvine mcvine 
-$ conda install jupyter
+$ conda env create --file conda_environment.yml
+$ conda activate mcvine
 ```
diff --git a/conda_environment.yml b/conda_environment.yml
new file mode 100644
index 0000000..e7f36e6
--- /dev/null
+++ b/conda_environment.yml
@@ -0,0 +1,25 @@
+name: mcvine
+channels:
+  - conda-forge
+  - mantid
+  - mcvine
+  - defaults
+dependencies:
+  - mantid-framework>=6
+  - mcvine=1.4.5
+  - mcvine.ui
+  - multiphonon
+  - ipykernel
+  - ipympl
+  - lmfit
+  - openmpi
+  - pandas
+  - python=3.9
+  - tqdm
+  - pylatex
+  - cloudpickle
+  - scikit-image
+  - pip
+  - pip:
+    - matlab
+    - mcpl