Add in robustness