Enhanced demo