Re-added Rod's timout condition