some tuning of demo mode