proposed changes more inline with DI philosophy