Most recent survey generators!! (this may be the final...)
Merge remote-tracking branch 'origin/maxima-survey' into maxima-survey