Some slight changes and Stephanie's code added.