Version1.1 adding repaint