more reworking of init