merging latest updates