change/add some timeouts