working on repaint