Updated SampleApp