Changes made by Amelie