Changed structure again.