Increased initial number of shapes, positioned them initially in the buckets.