More robustness work