initial changes for demo setup