Sample app done with some changes