Nice, the old code here really bugged me.