Did some changes in structure