Better generators (22/33)

Better generators