added some structure