Added more data
fixed merge conflicts