upstream refactoring
service bribge