get things working again, except for timeout