Redo some generation stuff!