added some more stucture