Update to first working version