Added makeShape()