Second finish of demo app