Main class modified
Merge branch 'r1_dataProvider'