Added Alex M.'s edits