Done with the demo app 2