Finish Doyle's revisions