Adding reogrganization capabilities