Reordered a few lines