squashing some  more timeout issues