not exactly sure what I changed....some code generation stuff I think