small changes in ShapeDemo