Finish demo app part1