make demo generic