Part 2 of changes merge