More changes to make demo simple