Incorporated changes by Miriam and Amy