Merge

More changes