enhancement with demo app