Changed setup code for compenent demonstration