added more data and changed some schema
merge fix