Added two more empty funcs