Minor changes for demo