added rest of data
removed dummy data
fixed merge