edit structure, some changes