Update to new demo-loading syntax