Merging newer changes