108119 decoupling refactor