move more functions to rest_func