Merge more changes