implement eventual dependency injection

everything said above solved :dancers: