Better generators (11/33)

Better generators