Demo tweaking