Added middle section, reorganized less a bit