Merge part 2 to master