Enabling/Disabling Demo options added.