Merging with new changes