Updated main to first working version