Revert Swayam's overwritten changes
Merge with Tianchi's changes
Merge pull request #7 from sharlwong/sharlene

Coordinate changes by Swayam, Avery and Tianchi