added all shapes