Extended the demo