bail-out early when optimizing and don't keep retrying when we
time-out. update version