added some stucture
merge conflict