This is a tweak of the sample_app