Added to handle grouped graphics