Demo code updates