New version, based on IESG feedback