RBFS changed return type. Still needs fix