finished experiment 1
finished experimetn2
fixed merge