Upgrade to 1.7