Made structural changes.