Changes to generation

more changes inc