LOTS of changes to eliminate reconfiguration generics