Tom's second Dec 30 edits