my edits for sample app