Daniel

Daniel looked at some of the issues around generation.

floor-> daniel: