@domcleal could you please re-review the new version?