few changes to init