Better generators (31/33)

Better generators