A little reorganizing.