Just rearranged a few lines..