updated to use rest_base