Better generators (7/33)

Better generators