Updated with demo code