Changed structure: building skeleton