Finish demo app --continued