New efforts against toxicity

New efforts against toxicity