Added rolling timeout