Changes made by Niels