Changes to the initialization check