redo of sample app