Merge_4

Need test on notebook