A re-edit after some criticism.