Changes based on Keith's review feedback.