Moved some lines around