Added some extra stuff for the demo.