Changed init logic