Merging Tom and Robert's changes from today