misc changes for the demo