Updated sample app