Relocated a few lines.