Added a few things for the demo