Changes made for demo - 2