Merging with latest changes