Did some work on tweaking the generation