Revamping sample app