Better generators (24/33)

Better generators