Revisions

Revisions to code from problem 2