Changes to init