Update to v.2.0