Updated Sample App to be streamlined