Finish code for experiment 2.2
Merge branch 'develop'