Changed init method