@hhuuggoo, @paddymul is there any way to implement this kind of substitution that is: a) much better for some reason, and b) can be done by tomorrow?