Changes made by Melissa