Used stageful component
Avoided redraw marker