"redraw" on click fixed, works yet not too good