Changes for Demo-1