SampleApp changes