Merge first working version