Update with More options about "Shape"