tweaking demo builder