got generation working correctly!