Revise shapes