Finish demo-app