better timouts handeling