merged code to make use of content injector, first update