Move the first-time-generation closer to its params