Tom's edits