moving some lines about.