Reverted some of the samples for the Demo