added Injection-related codes