Finished demo app again