Redo the Finish of demo app