Did more generation stuff