I think so. Also, all you are seeing is that a bunch of code was moved around, I don't think I changed the implementation of this at all.