Upgrade to version 7