Upgrade to version 2