renamed DI class #3