Next round of Tom edits