wip changes for the demo