not related to this PR, but why do we pass in injector ? that makes no sense to me...