Work version of sample-app