Improved sample app