#14 added rectangle and Madonna plot