Started implmenenting Amanda's comments.