Update
Old main file
Fixed merge conflicts