Swapped the order of a few lines