More changes to prepare for demo