Do first half of justin's edits
Do second half of Justin's edits