Code change that make the demo runnable