Better generators

:calendar: