Merging with latest updates