Changes made for Demo