Change to version 2.0