Updating to the latest 2.0.7