I don't really want the old method laying around, but they're essentially the same