A2: Out with the wigglers; in with the undulators