Final changes - Demonstration Done