Better generators (16/33)

Better generators