removing timeout approach