A bit hard to tell what's going on in this file, with the mixture of order changes/whitespace changes/code additions. I'm going to assume it's fine. :P