Tweaked the sample app