Update to working version