made some correction to the structure