change structures a little bit