Changes made for wip-demo