Some changes in structure.