Merge in new changes