Better generators (32/33)

Better generators