some changes in structure
some changes in structure