Applied revisions from Greg