Finish demo app
Update finished demo app