Redraw of runs, refactoring