Major improvements in the Demo functionality