New drawing routine from Nico and Daniela.