Probing rerun

It make sense to review it by commits as I separate fix and refactoring