combined circle and rect into stroke class