yes, it makes sense... I will do the modification and updated the PR...