Quick and dirty changes for the Demo