Upgrade to working version