More structural changes