Started upgrade to 2.0