adding baseur and timeout options