Merging All recent changes