Final touch
Merging changes