@jkeck do you think the new code is any worse than the old code in these respects?