improve output/retry behaviour