More Changes for the Demo