Major changes
Merging files again