Add Robustness. Tidy