Merging all together

Merging all together