these functions can be removed now or?