yey add more structure