Just moving some lines around