hmm I'm pretty sure this will break some clients- we need to test first