Changes to initialization.