just added some structure