Small change to init loop