yhsiang: that should work