Added Shawn's edits

Added Shawn's edits