Added some code to use in demo