Updating to version 2.0