Updating some code for demos