Modif from train2
merge