Update to hopefully working version