@phuongdh can you update this to use @mbklein 's method?  Then we can merge it.