Tom's Nov 16 edits