Better generators (29/33)

Better generators