added number of shapes in return value of figures()