add more shapes, and all classes