Update to work with demo