timeout+ finish changes