First modifications to the demo app