Upgrade to beta4