Changes made by Marc Forrer