Tweaking the sample app