Patrick Durusau's initial edits