added changes to init