Changed structure a bit.