Changes made for demo