Half way transitioning to ILC generated version