Added shape and convex.