It looks good. I think we can merge it for evaluating in other use cases.