Added scheduling timeout of 35 seconds