Reworked drawing.