Reogranized demo to be easier to read