Edits to demo for Jan 17