Final changes to sample_app