Improvement: Avoiding to redraw the whole screen