Update to 2.0. Almost finished