Updated to first working version