Merging latest updates