Updates to Demos and Persistance