An alternative way we could combine things for ticket #479