Done with the demo app again