Preparing to switch init scheme so it is called separately from fit