Tom's Jan 3 edits