Tom's second and final edits from Dec 10