Change timeout to 40s