adding better timeout options