Merging the latest updates