redid the generator to my liking