Enhanced demo app