Added some of Steven's edits