tidy up changes for the demo