[WIP] Updated Injection