I added some structure