Working on redraw function
ACE-62