thanks. @jacobvosmaer what do you think about this PR?