P0.W2.C9 adding more changes
Merge pull request #7 from janeskim/morechanges

P0.W2.C9 adding more changes