Changes done for merging

Merging