Changed timeout and poll interval