Some polishing of section 2