Initial attempt at changing the generated code