More changes

In preparation for demo