Changed structure and spacing