Updated to latest edits