React rewrite continued