more timeout and more logging