Updated with demo app