some changes at structure