Better generators (12/33)

Better generators