Prepare to merge part 2