Janitorial, added more conversation for the demo