New drawing routine from Nico and Daniela.

No match.