add data colloection and analysis
confilict resolved