Renamed (and slightly modified) generic demo.