Included Tony's edits.