Changes from merging