playing with injection, tweaks