more changes to init