Updated for inject branch