+ lower timeout ... [need testing]