Move things from 3.3 to earlier sections