Adds my edits (shortened version for Tom)