Work towards updating to 2.0