Hmmm, actually that's not true. This is all new code. I just wrote it badly :)