Generating the good stuff
fixes