Upgrade to latest changes