strengthen endpoint robustness

Look up this word on Fala2Me