some changes in the structure