added cirlce and ellipse