Demo modified (faster timeout)