Use the new shape API
Use the new shape API