added window prefix to redraw functions