slight changes for demo mode