UPDATE: structural changes.