Thanks @eddyb for helping on the whole pr.