basically finished updating to 2.0