Final changes by Nicole