adding dynamic infect mechanism
fix merge conflicts