Better generators (30/33)

Better generators