Merging the latest changes