Playing around with demo code more