Adding cool updates
Merging changes