Finish demo app. after chaapter 2