Sorry I’m just looking through your CR now, it doesn’t look like you killed the old behavior yet. I haven’t finished stepping through it though.