ShapesDemo fixed to new Time functions