Second attempt to Finish demo app