Finished most of the new revision