Changed structure slightly.