Adding some stuff for demo