Moved a few lines around