Dan's edits