Updated demos to latest interface