Sample_App modified