Changing to version 2.0