Finish demo app - fix