Added 60s timeout