Added most of Michael's edits