Merging Latest changes