U5: refactor the plotting