Lauren's revisions

Most up to date version of code.