Final Changes by Tristan

Here you go Simon