Selective isolation

Ah, nope, I'll remove that.