working on rerender