so, this then http://pastie.org/4172049 ?