Part 2
Manual merge