Done with the demo app 3