Better generators (10/33)

Better generators