Changed structure to react