Changed structure some more.