Update to latest working version