Second Round

First round of edits