Add robustnessness