@jonlemmon , testing suggests this logic works as we want it to, can you have a quick glance though to check we've not missed anything though