Generator: Updates to generating algorithm (partial).