structural changes, not finished