Changed init-functions call