editing for v. 2.0