Added two init funcs